diff --git a/requirements.txt b/requirements.txt
index 9a5e76ec1..cc19b6e56 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,10 +13,8 @@ django-rich==1.6.0
 django-rq==2.8.1
 django-tables2==2.5.3
 django-taggit==4.0.0
-<<<<<<< HEAD
-django-timezone-field==5.0
-django-tree-queries==0.14.0
 django-timezone-field==5.1
+django-tree-queries==0.14.0
 djangorestframework==3.14.0
 drf-spectacular==0.26.2
 drf-spectacular-sidecar==2023.6.1