Remove an old merge conflict