merge with mediator
fixed merge