Added a missing merge step after checkout.