Visual Studio Git Merge Conflict