removed the merge conflict headers