Seller is out now
merge changes