During cherry-pick conflicts, the user can do anything he wants