add table
fix merge conflict