Add merchant page
Edit for pull
Fixed conflict