Modified the head of the tables
Fixed merge conflicts