Merge in files, fix some bugs in inflections and recreate the tables
Fix all conflicts