Update #6

- Reverted the entity merchant part, should be created by the dev.