fixed the merchant toggle on the index page and dropped the extra tables
fixing conflict