all of the table code
resolving merge