diff --git a/README.md b/README.md
index b65a7f4..cc43e9d 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,7 @@ Additionally, `echo` now has a `-p` flag that expands prompt escape sequences, s
+<<<<<<< HEAD
### Keymaps
The `keymap` builtin lets you bind key sequences to actions in any editor mode: