diff --git a/README.md b/README.md
index 84d7028fa..313270718 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Sketch for a Taskd Replacement
 ------------------------------
 
@@ -107,10 +106,3 @@ TBD
 ## Recurrence
 
 TBD
-
-=======
-At the moment, this is sort of an make-work project to re-implement Taskwarrior in Rust.
-
-There's no great reason to do so, and lots of reasons not to.
-But it's a nice way to practice some "basic" Rust that does not exercise all of the language's more esoteric features.
->>>>>>> 93ce28ed15d11ba601765933f95756e7fb76d2e3