Visual Studio Merge Branch Into Another