diff --git a/ansible/app-configs/homepage/settings.yaml.j2 b/ansible/app-configs/homepage/settings.yaml.j2
index 80c1b73d..c14060f8 100644
--- a/ansible/app-configs/homepage/settings.yaml.j2
+++ b/ansible/app-configs/homepage/settings.yaml.j2
@@ -35,19 +35,15 @@ layout:
     columns: 4
   Lifestyle:
     style: row
-    columns: 4
+    columns: 3
   Automation:
     style: row
     columns: 5
   Privacy/Security:
     style: row
-<<<<<<< Updated upstream
-    columns: 5
+    columns: 3
   Personal Tools:
     style: row
-    columns: 5
-<<<<<<< HEAD
-=======
     columns: 3
   Personal Tools:
     style: row
@@ -55,18 +51,12 @@ layout:
   Professional Services:
     style: row
     columns: 3
->>>>>>> Stashed changes
-=======
-  Professional Tools:
-    style: row
-    columns: 3
->>>>>>> refs/remotes/origin/main
   Servarr Stack:
     style: row
     columns: 3
   Downloaders:
     style: row
-    columns: 
+    columns: 3
   Media Library:
     style: row
     columns: 3