diff --git a/pyproject.toml b/pyproject.toml
index 521f1755947c37eb7b8f636909db594a0ac03258..971a392f511629e84beda415bc30fe9bb8d5dee7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,6 +54,7 @@ priority = "primary"
 name = "gitlab"
 url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
 priority = "supplemental"
+
 [tool.poetry.dependencies]
 python = "^3.9"
 Django = "^4.1"
@@ -128,14 +129,11 @@ graphene-django = ">=3.0.0, <=3.1.2"
 selenium = "^4.4.3"
 django-vite = "^2.0.2"
 graphene-django-cud = "^0.10.0"
-<<<<<<< HEAD
 django-ical = "^1.8.3"
 django-recurrence = "^1.11.1"
 recurring-ical-events = "^2.0.2"
 django-timezone-field = "^5.0"
-=======
 uwsgi = "^2.0.21"
->>>>>>> master
 
 [tool.poetry.extras]
 ldap = ["django-auth-ldap"]
@@ -191,9 +189,5 @@ line-length = 100
 exclude = "/migrations/"
 
 [build-system]
-<<<<<<< HEAD
-requires = ["poetry-core"]
-=======
 requires = ["poetry-core>=1.0.0"]
->>>>>>> master
 build-backend = "poetry.core.masonry.api"