Remove merge conflict headers