removed <<<<< HEAD in tables.sql