Learn how to resolve a merge conflict in different ways.