diff --git a/salt/top.sls b/salt/top.sls
index fcd9ba98d..05e027a84 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -20,11 +20,7 @@ base:
     - firewall
     - master
     - idstools
-<<<<<<< HEAD
-    - redis
     - mysql
-=======
->>>>>>> 7816c6e18e21870b0249cc05a161ef1644a94066
     - elasticsearch
     - logstash
     - kibana
@@ -36,7 +32,7 @@ base:
     - filebeat
     - utility
     - schedule
-    - fleet 
+    - fleet
 
 
   'G@role:so-master':