https://rtcamp.com/tutorials/git/git-resolve-merge-conflicts/