diff --git a/alembic/versions/060_migrate_template_segments_to_clip_configs.py b/alembic/versions/060_migrate_template_segments_to_clip_configs.py
index d3800f5c2..539ab3f42 100644
--- a/alembic/versions/060_migrate_template_segments_to_clip_configs.py
+++ b/alembic/versions/060_migrate_template_segments_to_clip_configs.py
@@ -12,6 +12,7 @@ import json
 import uuid
 
 import sqlalchemy as sa
+
 from alembic import op
 
 revision = "060_migrate_segments"
diff --git a/tests/unit/test_unify_template_segments.py b/tests/unit/test_unify_template_segments.py
index 5224cd1a8..9fadd730b 100644
--- a/tests/unit/test_unify_template_segments.py
+++ b/tests/unit/test_unify_template_segments.py
@@ -1,8 +1,10 @@
 """Tests for unified template segments (read from template_clip_configs)."""
 
 import uuid
+
 <<<<<<< Updated upstream
 from unittest.mock import MagicMock
+
 =======
 >>>>>>> Stashed changes