sync merge with merge-mk