checkout: move 'confict_style' and 'dwim_..' to checkout_opts