diff --git a/default-programs b/default-programs
index 5633d9d..068c072 100644
--- a/default-programs
+++ b/default-programs
@@ -115,8 +115,6 @@ neofetch
 sxiv
 MISC_END
 
-<<<<<<< Updated upstream
-
 EXTRAS_START
 i3
 qtile
@@ -137,5 +135,3 @@ rlwrap
 dex
 vicious
 EXTRAS_END
-=======
->>>>>>> Stashed changes