added modified table.sql
merging
conflict resolved