Trying to push a merge conflict fix and receiving a merge conflict