Adding column edits for columns which have now diverged in their definitions. Also making sure data_file's collate is set correctly