Walmart Interview Question

Q. How would you resolve a merge conflict?