remove industry column from cities table
fix git merge conflicts