Fix DB error when Merchants arrive
Merge pull request #65 from KFCSpike/MerchantMovementError

Fix DB error when Merchants arrive