Veeva Systems Interview Question

How do you resolve a merge conflict in GitHub?