resolve conflicts

Author: valentijnscholten

requirements.txt

@@ -19,6 +19,7 @@ django-slack==5.19.0
 django-watson==1.6.3
 django-prometheus==2.4.1
 Django==5.2.8
+django-single-session==0.2.0
 djangorestframework==3.16.1
 html2text==2025.4.15
 humanize==4.13.0
@@ -48,6 +49,7 @@ packageurl-python==0.17.5
 django-crum==0.7.9
 JSON-log-formatter==1.1.1
 django-split-settings==1.3.2
+# do not upgrade to 2.1.1 - https://github.com/DefectDojo/django-DefectDojo/issues/12918
 git+https://github.com/valentijnscholten/django-tagulous.git@2984e7e1db6a56c2d9abcde1b9cd6440fdb05dfd#egg=django-tagulous
 PyJWT==2.10.1
 cvss==3.6