fix merchant clearing bug
fix active order bug