fix conflicts
checkout and cart gui