merge: always roll back lock in `checkout_fast_forward()`