Visual Studio Merge Branch Into Master