a couple missed items from rebase

src/nomad_simulations/outputs.py

@@ -24,16 +24,12 @@
 from nomad.datamodel.data import ArchiveSection
 from nomad.metainfo import Quantity, SubSection, MEnum
 from nomad.datamodel.metainfo.annotations import ELNAnnotation
-<<<<<<< HEAD
-=======
 from nomad.metainfo import Quantity, SubSection, SectionProxy, Reference
 # ? are we planning to enforce a dependency on simulationworkflowschema?
 from nomad.dependencies.simulationworkflowschema import SimulationWorkflow, MolecularDynamics
->>>>>>> 8399aa9 (Outputs inherits PhysicalProperty)
 
 from .model_system import ModelSystem
 from .numerical_settings import SelfConsistency
-<<<<<<< HEAD
 from .physical_property import PhysicalProperty
 
 from .variables import Variables, Temperatures  # ? delete these imports
@@ -63,9 +59,7 @@ class ElectronicBandGap(PhysicalProperty):
 
     def normalize(self, archive, logger) -> None:
         super().normalize(archive, logger)
-=======
 from .property import PhysicalProperty
->>>>>>> 8399aa9 (Outputs inherits PhysicalProperty)
 
 
 class Outputs(PhysicalProperty):