diff --git a/dev-requirements.txt b/dev-requirements.txt
index c1c84d0a4..f6ac22e2f 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,13 +1,9 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile --extra=dev --output-file=dev-requirements.txt pyproject.toml
 #
-appnope==0.1.3
-    # via
-    #   ipykernel
-    #   ipython
 asciitree==0.3.3
     # via zarr
 ase==3.22.1
@@ -48,16 +44,13 @@ comm==0.2.0
 contourpy==1.1.1
     # via matplotlib
 coverage[toml]==7.3.2
-    # via
-    #   coverage
-    #   pytest-cov
+    # via pytest-cov
 cycler==0.12.1
     # via matplotlib
 cython==3.0.6
     # via tables
 dask[array]==2023.5.0
     # via
-    #   dask
     #   hyperspy
     #   kikuchipy
     #   orix
@@ -122,17 +115,9 @@ h5py==3.10.0
     #   pynxtools (pyproject.toml)
     #   pyxem
     #   silx
-<<<<<<< HEAD
-<<<<<<< HEAD
 hdf5plugin==4.3.0
     # via fabio
 hyperspy==1.7.6
-=======
-    #   xrayutilities
-=======
->>>>>>> 4184ccb (removing x-ray utils in from xrd reader.)
-hyperspy==1.7.4
->>>>>>> 1db4efc (rb)
     # via
     #   kikuchipy
     #   pynxtools (pyproject.toml)
@@ -190,19 +175,8 @@ lazy-loader==0.3
     # via scikit-image
 llvmlite==0.41.1
     # via numba
-<<<<<<< HEAD
 lmfit==1.2.2
     # via pyxem
-=======
-lmfit==1.2.0
-<<<<<<< HEAD
-    # via
-    #   pyxem
-    #   xrayutilities
->>>>>>> 1db4efc (rb)
-=======
-    # via pyxem
->>>>>>> 4184ccb (removing x-ray utils in from xrd reader.)
 locket==1.0.0
     # via partd
 lxml==4.9.3
@@ -564,11 +538,6 @@ typing-extensions==4.8.0
     #   astroid
     #   cattrs
     #   mypy
-<<<<<<< HEAD
-=======
-    #   numcodecs
-    #   pylint
->>>>>>> 4184ccb (removing x-ray utils in from xrd reader.)
 tzdata==2023.3
     # via
     #   pandas
@@ -594,16 +563,7 @@ wheel==0.42.0
     # via pip-tools
 xarray==2023.1.0
     # via pynxtools (pyproject.toml)
-<<<<<<< HEAD
-<<<<<<< HEAD
 zarr==2.16.1
-=======
-xrayutilities==1.7.6
-    # via pynxtools (pyproject.toml)
-=======
->>>>>>> 4184ccb (removing x-ray utils in from xrd reader.)
-zarr==2.12.0
->>>>>>> 1db4efc (rb)
     # via hyperspy
 zipfile37==0.1.3
     # via pynxtools (pyproject.toml)