https://codelife.javelupango.com/blog/merging-two-different-branches-using-visual-studio/
How to merge two different branches using Visual Studio