Fixed checkout
merge