diff --git a/share/config.yml b/share/config.yml
index 7dd1abd5..7d32289c 100644
--- a/share/config.yml
+++ b/share/config.yml
@@ -589,14 +589,6 @@ deferrable_actions:
   - 'macwalk'
   - 'arpwalk'
   - 'discoverall'
-<<<<<<< Updated upstream
-=======
-  - 'macwalk'
-  - 'nbtwalk'
-  - 'primeskiplist'
-  - 'scheduler'
-  - 'snapshot'
->>>>>>> Stashed changes
 
 # ---------------
 # GraphViz Export