Update #2

- Merchant holding for entities.
- Witch merchant added