https://waynerv.com/posts/git-merge-intro/