update code for merchant
fix conflict