Swap the ordering of creating tables
fix merge