diff --git a/README.md b/README.md
index 169f165..640f31a 100644
--- a/README.md
+++ b/README.md
@@ -50,12 +50,8 @@ Eg: `pigeon identity show` becomes `./pigeon-cli show`.
  - [X] Fix diagram in spec doc
  - [X] refactor `Bundle.create` to use `message find-all`.
  - [X] Rename `message find` to `message read`, since other finders return a multihash.
-<<<<<<< HEAD
- - [ ] Move stuff involving `LocalIdentity` out of `Message` class and into `Draft` class (re-use lexer logic)?
-=======
  - [ ] Message.ingest should be the only code path to message authoring.
  - [ ] Make all methods private except those required for the CLI.
->>>>>>> draft_refactor
  - [ ] Don't allow any type of whitespace in `kind` or `string` keys. Write a test for this.
  - [ ] Add Lipmaa links like the Bamboo folks do.
  - [ ] Create regexes in ::Lexer using strings and Regexp.new() for cleaner regexes.