Merchant

One who buys and sells, as a way of life. Generally a merchant was more likely to go and fetch his stock and bring it to the market, whereas a trader was more likely to be the one who received goods at a market, and then sold on to consumers.