Remove extra conflict header