Best Buy Interview Question

How do you solve merging conflicts?