Learn how to resolve a merge conflict in different ways. - View it on GitHub