git screwed up the merge again