Decide in advance how you will resolve merge conflicts. Will you use a mediator (therapist)? Will you time-box arguments? Will you write a conflict resolution protocol together?