diff --git a/pyproject.toml b/pyproject.toml
index 5235d0ca..38fadca2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -28,22 +28,14 @@ classifiers = [
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
-<<<<<<<
   "Topic :: Scientific/Engineering :: Physics",
-=======
-docs = [
-  "sphinx",
-  "sphinx-automodapi",
-  "packaging",
->>>>>>>
-]
 dependencies = [
-  'astropy>=5.3.0',
-  'numpy>=1.23.5',
-  'matplotlib>=3.5.0',
-  'scipy>=1.10.1',
-  'scikit-image>=0.20.0',
-  'sunpy[map]>=6.0.0',
+  "astropy>=5.3.0",
+  "numpy>=1.23.5",
+  "matplotlib>=3.5.0",
+  "scipy>=1.10.1",
+  "scikit-image>=0.20.0",
+  "sunpy[map]>=6.0.0",
 ]
 
 [project.optional-dependencies]
@@ -52,26 +44,26 @@ all = ["sunkit_image[watroo]"]
 watroo = ["watroo"]
 tests = [
   "sunkit_image[all]",
-  'dask',
-  'pytest-astropy',
-  'pytest-mpl',
+  "dask",
+  "pytest-astropy",
+  "pytest-mpl",
   "pytest-xdist",
   "sunpy[data,net]>=6.0.0",
 ]
 docs = [
+  "sphinx",
+  "sphinx-automodapi",
+  "packaging",
   "sunkit_image[all]",
-  'astroscrappy',
-  'dask',
-  'matplotlib',
-  'sphinx-automodapi',
-  'sphinx-changelog',
-  'sphinx-design',
-  'sphinx-gallery',
-  'sphinx',
-  'sunpy-sphinx-theme',
-  'sunpy[data,net]>=6.0.0',
+  "astroscrappy",
+  "dask",
+  "matplotlib",
+  "sphinx-changelog",
+  "sphinx-design",
+  "sphinx-gallery",
+  "sunpy-sphinx-theme",
+  "sunpy[data,net]>=6.0.0",
 ]
-
 dev = ["sunkit_image[all,tests,docs]"]
 
 [project.urls]