Visual Studio Merge Master Into Branch