try checkout/merge instead of just checkout