removed lines that must have been put in by the merge