Migrated to imports
Fixed merge conflict