collapse imports

attempt to reduce merge conflicts as it's always the import statements that are conflicting