Pergunta de entrevista da empresa Best Buy

How do you solve merging conflicts?