diff --git a/init.el b/init.el
index 380263e..6aad710 100644
--- a/init.el
+++ b/init.el
@@ -929,7 +929,9 @@ If no name is given, list all bookmarks instead."
                          ((= status-char ?D)
                           (add-to-list 'status-arr ?))
                          ((= status-char ?R)
-                          (add-to-list 'status-arr ?»)))))
+                          (add-to-list 'status-arr ?»))
+                         ((= status-char ?U)
+                          (add-to-list 'status-arr ?=)))))
         (sort status-arr #'<)
         (when branch-status
           (push branch-status status-arr))
@@ -941,7 +943,9 @@ If no name is given, list all bookmarks instead."
          ((file-exists-p (expand-file-name "REVERT_HEAD" git-dir))
           "REVERTING")
          ((file-exists-p (expand-file-name "rebase-merge" git-dir))
-          "REBASING"))))
+          "REBASING")
+         ((file-exists-p (expand-file-name "MERGE_HEAD" git-dir))
+          "MERGING"))))
     (defun my/-eshell-prompt-git-status ()
       "Get git status for `my/-eshell-prompt-function'"
       (let ((branch (car (vc-git-branches)))