Merge second conflicting branch into mediator.