diff --git a/apps/accounts/migrations/0001_initial.py b/apps/accounts/migrations/0001_initial.py
index 85e0527..67f5b30 100644
--- a/apps/accounts/migrations/0001_initial.py
+++ b/apps/accounts/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.utils.timezone
 import uuid
diff --git a/apps/accounts/migrations/0002_initial.py b/apps/accounts/migrations/0002_initial.py
index 7467e3b..3d923a7 100644
--- a/apps/accounts/migrations/0002_initial.py
+++ b/apps/accounts/migrations/0002_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.db.models.deletion
 from django.conf import settings
diff --git a/apps/ai_engine/migrations/0001_initial.py b/apps/ai_engine/migrations/0001_initial.py
index 5b7fbd5..3f4e143 100644
--- a/apps/ai_engine/migrations/0001_initial.py
+++ b/apps/ai_engine/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.db.models.deletion
 import uuid
diff --git a/apps/analytics/migrations/0001_initial.py b/apps/analytics/migrations/0001_initial.py
index 5dad3d1..66e3d3d 100644
--- a/apps/analytics/migrations/0001_initial.py
+++ b/apps/analytics/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.db.models.deletion
 import uuid
diff --git a/apps/appreciation/migrations/0001_initial.py b/apps/appreciation/migrations/0001_initial.py
index 2816c46..572d681 100644
--- a/apps/appreciation/migrations/0001_initial.py
+++ b/apps/appreciation/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.db.models.deletion
 import uuid
diff --git a/apps/callcenter/migrations/0001_initial.py b/apps/callcenter/migrations/0001_initial.py
index 981d56b..27f9002 100644
--- a/apps/callcenter/migrations/0001_initial.py
+++ b/apps/callcenter/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.db.models.deletion
 import uuid
diff --git a/apps/complaints/migrations/0001_initial.py b/apps/complaints/migrations/0001_initial.py
index 23a92f4..6eec7ce 100644
--- a/apps/complaints/migrations/0001_initial.py
+++ b/apps/complaints/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.db.models.deletion
 import uuid
diff --git a/apps/complaints/migrations/0002_initial.py b/apps/complaints/migrations/0002_initial.py
index 2f57c66..78f119d 100644
--- a/apps/complaints/migrations/0002_initial.py
+++ b/apps/complaints/migrations/0002_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.db.models.deletion
 from django.conf import settings
diff --git a/apps/complaints/migrations/0003_initial.py b/apps/complaints/migrations/0003_initial.py
index 8f9537a..b38faa2 100644
--- a/apps/complaints/migrations/0003_initial.py
+++ b/apps/complaints/migrations/0003_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.db.models.deletion
 from django.conf import settings
diff --git a/apps/core/migrations/0001_initial.py b/apps/core/migrations/0001_initial.py
index d4b7acc..7fae5e7 100644
--- a/apps/core/migrations/0001_initial.py
+++ b/apps/core/migrations/0001_initial.py
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Generated by Django 6.0 on 2026-01-12 09:50
-=======
-# Generated by Django 6.0.1 on 2026-01-12 09:50
->>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
 
 import django.db.models.deletion
 import uuid
diff --git a/apps/feedback/migrations/0001_initial.py b/apps/feedback/migrations/0001_initial.py
index f05b8c7..24eebd5 100644
--- a/apps/feedback/migrations/0001_initial.py
+++ b/apps/feedback/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.db.models.deletion
 import uuid
diff --git a/apps/feedback/migrations/0002_initial.py b/apps/feedback/migrations/0002_initial.py
index 2dd8502..7a12514 100644
--- a/apps/feedback/migrations/0002_initial.py
+++ b/apps/feedback/migrations/0002_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.db.models.deletion
 from django.conf import settings
diff --git a/apps/feedback/migrations/0003_initial.py b/apps/feedback/migrations/0003_initial.py
index 44d2190..b86ab6a 100644
--- a/apps/feedback/migrations/0003_initial.py
+++ b/apps/feedback/migrations/0003_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.db.models.deletion
 from django.conf import settings
diff --git a/apps/integrations/migrations/0001_initial.py b/apps/integrations/migrations/0001_initial.py
index 3175c56..dc082dc 100644
--- a/apps/integrations/migrations/0001_initial.py
+++ b/apps/integrations/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.db.models.deletion
 import uuid
diff --git a/apps/journeys/migrations/0001_initial.py b/apps/journeys/migrations/0001_initial.py
index bcddf72..07dedf4 100644
--- a/apps/journeys/migrations/0001_initial.py
+++ b/apps/journeys/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.db.models.deletion
 import uuid
diff --git a/apps/journeys/migrations/0002_initial.py b/apps/journeys/migrations/0002_initial.py
index 1df1564..fb75bfe 100644
--- a/apps/journeys/migrations/0002_initial.py
+++ b/apps/journeys/migrations/0002_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.db.models.deletion
 from django.db import migrations, models
diff --git a/apps/notifications/migrations/0001_initial.py b/apps/notifications/migrations/0001_initial.py
index 7e3295c..12978eb 100644
--- a/apps/notifications/migrations/0001_initial.py
+++ b/apps/notifications/migrations/0001_initial.py
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Generated by Django 6.0 on 2026-01-12 09:50
-=======
-# Generated by Django 6.0.1 on 2026-01-12 09:50
->>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
 
 import django.db.models.deletion
 import uuid
diff --git a/apps/observations/migrations/0001_initial.py b/apps/observations/migrations/0001_initial.py
index a059f26..dfaacfd 100644
--- a/apps/observations/migrations/0001_initial.py
+++ b/apps/observations/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import apps.observations.models
 import django.db.models.deletion
diff --git a/apps/organizations/migrations/0001_initial.py b/apps/organizations/migrations/0001_initial.py
index 8b6a98d..04d519d 100644
--- a/apps/organizations/migrations/0001_initial.py
+++ b/apps/organizations/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.db.models.deletion
 import uuid
diff --git a/apps/physicians/migrations/0001_initial.py b/apps/physicians/migrations/0001_initial.py
index 211d14c..bba5ef5 100644
--- a/apps/physicians/migrations/0001_initial.py
+++ b/apps/physicians/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.db.models.deletion
 import uuid
diff --git a/apps/projects/migrations/0001_initial.py b/apps/projects/migrations/0001_initial.py
index f547dca..de3c36b 100644
--- a/apps/projects/migrations/0001_initial.py
+++ b/apps/projects/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.db.models.deletion
 import uuid
diff --git a/apps/projects/migrations/0002_initial.py b/apps/projects/migrations/0002_initial.py
index 46a13cb..2fe3f6d 100644
--- a/apps/projects/migrations/0002_initial.py
+++ b/apps/projects/migrations/0002_initial.py
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Generated by Django 6.0 on 2026-01-12 09:50
-=======
-# Generated by Django 6.0.1 on 2026-01-12 09:50
->>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
 
 import django.db.models.deletion
 from django.conf import settings
diff --git a/apps/px_action_center/migrations/0001_initial.py b/apps/px_action_center/migrations/0001_initial.py
index 6161572..57eb05c 100644
--- a/apps/px_action_center/migrations/0001_initial.py
+++ b/apps/px_action_center/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.db.models.deletion
 import uuid
diff --git a/apps/px_sources/migrations/0001_initial.py b/apps/px_sources/migrations/0001_initial.py
index 2195c2c..94fd2c3 100644
--- a/apps/px_sources/migrations/0001_initial.py
+++ b/apps/px_sources/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.db.models.deletion
 import uuid
diff --git a/apps/references/migrations/0001_initial.py b/apps/references/migrations/0001_initial.py
index 4fde651..0059d7a 100644
--- a/apps/references/migrations/0001_initial.py
+++ b/apps/references/migrations/0001_initial.py
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Generated by Django 6.0 on 2026-01-12 09:50
-=======
-# Generated by Django 6.0.1 on 2026-01-12 09:50
->>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
 
 import apps.references.models
 import django.db.models.deletion
diff --git a/apps/social/migrations/0001_initial.py b/apps/social/migrations/0001_initial.py
index f0204af..ae7f23f 100644
--- a/apps/social/migrations/0001_initial.py
+++ b/apps/social/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 from django.db import migrations, models
 
diff --git a/apps/standards/migrations/0001_initial.py b/apps/standards/migrations/0001_initial.py
index 62877fe..5150aac 100644
--- a/apps/standards/migrations/0001_initial.py
+++ b/apps/standards/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.1 on 2026-01-12 09:50
+# Generated by Django 6.0 on 2026-01-12 09:50
 
 import django.core.validators
 import django.db.models.deletion
diff --git a/apps/surveys/migrations/0001_initial.py b/apps/surveys/migrations/0001_initial.py
index de07dd1..96193fb 100644
--- a/apps/surveys/migrations/0001_initial.py
+++ b/apps/surveys/migrations/0001_initial.py
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Generated by Django 6.0 on 2026-01-12 09:50
-=======
-# Generated by Django 6.0.1 on 2026-01-12 09:50
->>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
 
 import django.db.models.deletion
 import uuid