Fix conflict in prepare_values_extra_move.