copy edits
fixed merge conflict