diff --git a/home/base/desktop/editors/emacs/README.md b/home/base/desktop/editors/emacs/README.md
index 67f5a13c..90fcfc68 100644
--- a/home/base/desktop/editors/emacs/README.md
+++ b/home/base/desktop/editors/emacs/README.md
@@ -198,6 +198,12 @@ Magit is a powerful tool that make git operations easy and intuitive.
 
 Shortcuts in magit's pane:
 
+<<<<<<< HEAD
+=======
+> When run `git commit` / `git add` / `git push` /... via magit, multiple Arguments can be set.
+> Set arguments won't trigger a git command immediately. Magit will try to run a git command only after an Action key is pressed.
+
+>>>>>>> d61e580 (docs: emacs - magit)
 | Action                                             | Shortcut  |
 | -------------------------------------------------- | --------- |
 | Quit the current Magit pane                        | `q`       |
@@ -210,3 +216,7 @@ Shortcuts in magit's pane:
 | Merge                                              | `m`       |
 | Fold/Unfold                                        | `TAB`     |
 | Show details of the current unit(commit/stage/...) | `<ENTER>` |
+<<<<<<< HEAD
+=======
+
+>>>>>>> d61e580 (docs: emacs - magit)