Git and Visual Studio 2017 part 5 : Merging the changes