worked in nytimes
merge conflict