Merge mediator/master