diff --git a/TODO b/TODO
index b4fccfae1..fa17ed5b3 100644
--- a/TODO
+++ b/TODO
@@ -26,16 +26,11 @@ vMinecraft v2 Updates!
 			how much longer they are probated for.
 
 DONE
-        +Added /freeze command to stop players from moving
+    +Added /freeze command to stop players from moving
 	+ Quick recode of /me to use the new getName function
-<<<<<<< HEAD
+    + Promote and Demote (ASAP) <Cere> DIBS
     + Simple Fire Antigrief
     + /prefix
-=======
-        + Promote and Demote (ASAP) <Cere> DIBS
-        + Simple Fire Antigrief
-        + /prefix
->>>>>>> 30d6b1ac5186143118978d1d49d9be4295585464
 	+ /a to toggle admin chat
 	+ Code was organized
 	+ Aliasing was added