Fix DB error when Merchants arrive