merge: -m none functional again