Best Buy interview question

How do you solve merging conflicts?