Git Resolve Merge Conflict In Visual Studio