checkout -m path: fix recreating conflicts