fixing git's retardation, it had a merge conflict with itself