diff --git a/README.md b/README.md
index 60c6a7a..8229c9c 100644
--- a/README.md
+++ b/README.md
@@ -20,8 +20,5 @@ If no command is specified, it is assumed to be the add command.
 - use a real database instead of json files
 - multiple todo lists
 - default filters
-<<<<<<< HEAD
 - `Task` object generates new string on `__str__` method instead of relying on
-=======
-- Task object generates new string on __str__ method instead of relying on
   accurate updating from functions