I wrote a blog post on how to resolve merge conflicts in Git

https://dev.to/github/how-do-i-resolve-merge-conflicts-5438