mm: fix merge errors