Removed merge conflict header