setting up checkout
setting up checkout
fix broken user tests
fix merge conflicts