Git didn't auto merge correctly