refactored codes in merchant step3
fixed conflict