git for visual studio sucks at merging