There are actually 3 merchants there, The Smithy, One downstairs in the Pub, and the shady one upstairs in the Pub. It seems that they restock once you level up.
Friendship is like peeing on yourself: everyone can see it, but only you get the warm feeling that it brings.
