diff --git a/TODO b/TODO
index 209717af5c..5929a82de6 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,3 @@
-<<<<<<< TODO
-=======
 Suggested package updates
 =========================
 
@@ -162,4 +160,3 @@ Suggested fixes
 ===============
 
 	o xscreensaver, PR 43047
->>>>>>> 1.610