git sucks at merging