Gracefully prompt operator to deal with merge conflicts.