fix dependency files

Author: nvaytet

requirements/base.in

@@ -3,11 +3,7 @@
 # --- END OF CUSTOM SECTION ---
 # The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
 dask
-<<<<<<< HEAD
-essreduce>=25.02.3
-=======
 essreduce>=25.02.4
->>>>>>> main
 graphviz
 numpy
 plopp

requirements/base.txt

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-# SHA1:453953b7160748669892413b1efa541107c4a89b
-=======
-# SHA1:4b779f60b811ecde0982bc9dc5df5ed5b296b876
->>>>>>> main
+# SHA1:bd57e2addebc398f9de7064eb2a5c993a359ba46
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -33,11 +29,7 @@ dnspython==2.7.0
     # via email-validator
 email-validator==2.2.0
     # via scippneutron
-<<<<<<< HEAD
-essreduce==25.2.3
-=======
 essreduce==25.2.4
->>>>>>> main
     # via -r base.in
 executing==2.2.0
     # via stack-data
@@ -53,11 +45,8 @@ h5py==3.12.1
     #   scippnexus
 idna==3.10
     # via email-validator
-<<<<<<< HEAD
 importlib-resources==6.5.2
     # via tof
-=======
->>>>>>> main
 ipydatawidgets==4.3.5
     # via pythreejs
 ipython==8.32.0
@@ -149,10 +138,7 @@ scipp==25.2.0
     #   essreduce
     #   scippneutron
     #   scippnexus
-<<<<<<< HEAD
     #   tof
-=======
->>>>>>> main
 scippneutron==25.2.0
     # via
     #   -r base.in

requirements/nightly.txt

@@ -54,11 +54,8 @@ idna==3.10
     # via
     #   email-validator
     #   requests
-<<<<<<< HEAD
 importlib-resources==6.5.2
     # via tof
-=======
->>>>>>> main
 iniconfig==2.0.0
     # via pytest
 ipydatawidgets==4.3.5
@@ -191,11 +188,8 @@ six==1.17.0
     # via python-dateutil
 stack-data==0.6.3
     # via ipython
-<<<<<<< HEAD
 tof @ git+https://github.com/scipp/tof@main
     # via -r nightly.in
-=======
->>>>>>> main
 toolz==1.0.0
     # via
     #   dask

src/ess/powder/types.py

@@ -13,7 +13,6 @@
 
 import sciline
 import scipp as sc
-from scippneutron import metadata
 from scippneutron.io import cif
 from scippneutron.metadata import Person, Software