add order function to merchant
fix conflict