Ddl

this should fix your merge conflict in table.py