Merge first conflicting branch into mediator.