diff --git a/pyproject.toml b/pyproject.toml
index bf4155e1d3f889d7b5cbae6f650a03d08d46dba2..088200e44f589e221982ddaab825986c4224243d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,6 @@ readme = "README.md"
 license = { file = "LICENSE" }
 classifiers = [
     "Development Status :: 2 - Pre-Alpha",
-<<<<<<< HEAD
     "Intended Audience :: Developers",
     "Intended Audience :: Education",
     "Intended Audience :: Science/Research",
@@ -28,10 +27,6 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Artificial Intelligence",
     "Topic :: Software Development"
 ]
-=======
-    "Programming Language :: Python :: 3"
-    ]
->>>>>>> 22e47ad9fb629f85ed4f1c5fa981c1d195c0201b
 dynamic = ["version"] # defined by pbr
 
 [build-system]