diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index 59aa8c212598a..9636a54249263 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -88,3 +88,4 @@
 | `:move` | Move the current buffer and its corresponding file to a different path |
 | `:yank-diagnostic` | Yank diagnostic(s) under primary cursor to register, or clipboard by default |
 | `:echo` | Print the processed input to the editor status |
+| `:yank-diagnostic` | Yank diagnostic(s) under primary cursor to register, or clipboard by default |
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 8ece558ec99d3..25cf0503bf385 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2459,11 +2459,8 @@ fn echo(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) ->
     if event != PromptEvent::Validate {
         return Ok(());
     }
-
     let args = args.join(" ");
-
     cx.editor.set_status(args);
-
     Ok(())
 }
 
@@ -3075,19 +3072,18 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
         signature: CommandSignature::positional(&[completers::filename]),
     },
     TypableCommand {
-<<<<<<< HEAD
         name: "yank-diagnostic",
         aliases: &[],
         doc: "Yank diagnostic(s) under primary cursor to register, or clipboard by default",
         fun: yank_diagnostic,
         signature: CommandSignature::none(),
-=======
+    },
+    TypableCommand {
         name: "echo",
         aliases: &[],
         doc: "Print the processed input to the editor status",
         fun: echo,
         signature: CommandSignature::all(completers::variables)
->>>>>>> 4c576d45 (Add echo command. Add %{cwd})
     },
 ];