mm: fixing derp during merge