Fixed appearance of merchant
Put in proper code for merchant