diff --git a/src/main/frontend/fs/diff_merge.cljs b/src/main/frontend/fs/diff_merge.cljs
index 3b1835e0a4..31131b8977 100644
--- a/src/main/frontend/fs/diff_merge.cljs
+++ b/src/main/frontend/fs/diff_merge.cljs
@@ -39,6 +39,7 @@
                     blocks levels)]
     blocks))
 
+;; TODO: Switch to ast->diff-blocks-alt
 ;; Diverged from gp-block/extract-blocks for decoupling
 ;; The process of doing 2 way diff is like:
 ;; 1. Given a base ver. of page (AST in DB), and a branch ver. of page (externally modified file content)
@@ -97,6 +98,8 @@
   (let [{:keys [start_pos end_pos]} pos-meta]
     (utf8/substring raw-content start_pos end_pos)))
 
+;; Diverged from ast->diff-blocks
+;; Add :meta :raw-body to the block
 (defn- ast->diff-blocks-alt
   "Prepare the blocks for diff-merge
    blocks: ast of blocks
@@ -145,7 +148,7 @@
               content-raw (get-sub-content-from-pos-meta utf8-encoded-content pos-meta)
               uuid (:id properties)]
           (cons {:body content
-                 :raw-body (string/trimr content-raw)
+                 :meta {:raw-body (string/trimr content-raw)}
                  :level 1
                  :uuid uuid}
                 (reverse headings)))))))
diff --git a/src/test/frontend/fs/diff_merge_test.cljs b/src/test/frontend/fs/diff_merge_test.cljs
index 7000d0d18a..09b9b17fff 100644
--- a/src/test/frontend/fs/diff_merge_test.cljs
+++ b/src/test/frontend/fs/diff_merge_test.cljs
@@ -119,7 +119,81 @@
 [{:body "a\nid:: 63e25526-3612-4fb1-8cf9-f66db1254a58"
   :uuid "63e25526-3612-4fb1-8cf9-f66db1254a58" :level 1}
  {:body "b" :uuid nil :level 2}
- {:body "c" :uuid nil :level 3}]))
+ {:body "c" :uuid nil :level 3}]
+  
+  "alias:: ⭐️\nicon:: ⭐️"
+[{:body "alias:: ⭐️\nicon:: ⭐️", :level 1, :uuid nil}]))
+
+(defn text->diffblocks-alt
+  [text]
+  (-> (gp-mldoc/->edn text (gp-mldoc/default-config :markdown))
+      (#'fs-diff/ast->diff-blocks-alt text :markdown {:block-pattern "-"})))
+
+(deftest md->ast->diff-blocks-alt-test
+  (are [text diff-blocks]
+       (= (text->diffblocks-alt text)
+          diff-blocks)
+    "- a
+\t- b
+\t\t- c"
+    [{:body "a" :uuid nil :level 1 :meta {:raw-body "- a"}}
+     {:body "b" :uuid nil :level 2 :meta {:raw-body "\t- b"}}
+     {:body "c" :uuid nil :level 3 :meta {:raw-body "\t\t- c"}}]
+
+    "- a
+\t- b
+\t\t- c
+\t\t  multiline
+- d"
+    [{:body "a" :uuid nil :level 1 :meta {:raw-body "- a"}}
+     {:body "b" :uuid nil :level 2 :meta {:raw-body "\t- b"}}
+     {:body "c\nmultiline" :uuid nil :level 3 :meta {:raw-body "\t\t- c\n\t\t  multiline"}}
+     {:body "d" :uuid nil :level 1 :meta {:raw-body "- d"}}]
+
+    "## hello
+\t- world
+\t\t- nice
+\t\t\t- nice
+\t\t\t- bingo
+\t\t\t- world"
+    [{:body "## hello" :uuid nil :level 1 :meta {:raw-body "## hello"}}
+     {:body "world" :uuid nil :level 2 :meta {:raw-body "\t- world"}}
+     {:body "nice" :uuid nil :level 3 :meta {:raw-body "\t\t- nice"}}
+     {:body "nice" :uuid nil :level 4 :meta {:raw-body "\t\t\t- nice"}}
+     {:body "bingo" :uuid nil :level 4 :meta {:raw-body "\t\t\t- bingo"}}
+     {:body "world" :uuid nil :level 4 :meta {:raw-body "\t\t\t- world"}}]
+
+    "# a
+## b
+### c
+#### d
+### e
+- f
+\t- g
+\t\t- h
+\t- i
+- j"
+    [{:body "# a" :uuid nil :level 1 :meta {:raw-body "# a"}}
+     {:body "## b" :uuid nil :level 1 :meta {:raw-body "## b"}}
+     {:body "### c" :uuid nil :level 1 :meta {:raw-body "### c"}}
+     {:body "#### d" :uuid nil :level 1 :meta {:raw-body "#### d"}}
+     {:body "### e" :uuid nil :level 1 :meta {:raw-body "### e"}}
+     {:body "f" :uuid nil :level 1 :meta {:raw-body "- f"}}
+     {:body "g" :uuid nil :level 2 :meta {:raw-body "\t- g"}}
+     {:body "h" :uuid nil :level 3 :meta {:raw-body "\t\t- h"}}
+     {:body "i" :uuid nil :level 2 :meta {:raw-body "\t- i"}}
+     {:body "j" :uuid nil :level 1 :meta {:raw-body "- j"}}]
+
+    "- a\n  id:: 63e25526-3612-4fb1-8cf9-f66db1254a58
+\t- b
+\t\t- c"
+    [{:body "a\nid:: 63e25526-3612-4fb1-8cf9-f66db1254a58"
+      :uuid "63e25526-3612-4fb1-8cf9-f66db1254a58" :level 1 :meta {:raw-body "- a\n  id:: 63e25526-3612-4fb1-8cf9-f66db1254a58"}}
+     {:body "b" :uuid nil :level 2 :meta {:raw-body "\t- b"}}
+     {:body "c" :uuid nil :level 3 :meta {:raw-body "\t\t- c"}}]
+    
+    "alias:: ⭐️\nicon:: ⭐️"
+    [{:body "alias:: ⭐️\nicon:: ⭐️", :meta {:raw-body "alias:: ⭐️\nicon:: ⭐️"}, :level 1, :uuid nil}]))
 
 (deftest diff-test
   (are [text1 text2 diffs]