Checkout conflict resolved