checkout conflict