diff --git a/poetry.lock b/poetry.lock
index 2e8c6f32..39550192 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1298,8 +1298,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
 [metadata]
 lock-version = "2.0"
 python-versions = "~3.9"
-<<<<<<< HEAD
-content-hash = "3a827c3e82f8a1c5ae08b374c4f246ce5517e55a6675324326cb309fb781785c"
-=======
-content-hash = "72c98c5ebe3db16f613c40c9ef8e80ac30f7e48aeb69ff86d63fb7583adb9dc3"
->>>>>>> aeb8ef26d262cbd2094143129e97b43fb58f6bfd
+content-hash = "3a827c3e82f8a1c5ae08b374c4f246ce5517e55a6675324326cb309fb781785c"
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index 3249d56c..6540b74e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,11 +15,8 @@ fabric = "^3.2.2"
 django-autocomplete-light = "^3.9.7"
 djangorestframework = "^3.14.0"
 google-api-python-client = "^2.99.0"
-<<<<<<< HEAD
 pillow = "^9.5.0"
-=======
 icalendar = "^5.0.10"
->>>>>>> aeb8ef26d262cbd2094143129e97b43fb58f6bfd
 
 [tool.poetry.group.prod]
 optional = true
@@ -55,4 +52,4 @@ omit = [
 [tool.coverage.report]
 skip_covered = true
 sort = "miss"
-fail_under = 85
+fail_under = 85
\ No newline at end of file