aggravating git problems with merging