fix-conflict-move.js