Add diagnostics to merge-mk