Moved merchant restock from trade start to dialogue start, since other services also interact with it.