fixed the one table
fixed table
fixed merge conflicts