Question d’entretien chez Best Buy

How do you solve merging conflicts?