Merge With Visual Studio

VS has a bad git integration...