merge conflicts and copy edits