https://muhdavi.github.io/posts/handling-a-git-pull-request-with-merge-conflict/