Schema.org importer
Fix merge conflicts.