drop merge-conflict mapping