final improves to merge on mediator fork