deleted merge conflict header