automatic-merge-conflict-resolver