Microsoft Visual Studio Git Merge