fix a couple of merge confusion
add show_user/merchant page