git-merge-merging-is-gits-way-of-putting-a-forked-history-back-together-again https://www.atlassian.com/git/tutorials/using-branches/git-merge