diff --git a/requirements.txt b/requirements.txt
index 2f77d86e..75925352 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,12 +10,8 @@ django-user-messages
 django-slack
 django-ninja
 django-polymorphic
-<<<<<<< HEAD
 django-maintenance-mode
-=======
-django-debug-toolbar
 django-tz-detect
->>>>>>> 1a1c053 (user may change mark date)
 meilisearch
 easy-thumbnails
 lxml