cleaned up checkout
Fixed merge conflict