fix error message and restrictions for seller
fix merge