Pergunta de entrevista da empresa Walmart

Q. How would you resolve a merge conflict?