diff --git a/manifest.json b/manifest.json
index 80ea55e..4c795f4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
     "id": "obsidian-livesync",
     "name": "Self-hosted LiveSync",
-    "version": "0.17.1",
+    "version": "0.17.2",
     "minAppVersion": "0.9.12",
     "description": "Community implementation of self-hosted livesync. Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
     "author": "vorotamoroz",
diff --git a/package-lock.json b/package-lock.json
index 9b92d0e..232aace 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.17.1",
+    "version": "0.17.2",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "obsidian-livesync",
-            "version": "0.17.1",
+            "version": "0.17.2",
             "license": "MIT",
             "dependencies": {
                 "diff-match-patch": "^1.0.5",
diff --git a/package.json b/package.json
index 3cc1dc9..6a7ec19 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.17.1",
+    "version": "0.17.2",
     "description": "Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
     "main": "main.js",
     "type": "module",
diff --git a/updates.md b/updates.md
index efae328..7df4b40 100644
--- a/updates.md
+++ b/updates.md
@@ -14,6 +14,12 @@
   - Fixed: Now we can verify and repair the database.
   - Refactored inside.
 
+- 0.17.2
+  - New feature
+    - We can merge conflicted documents automatically if sensible.
+  - Fixed
+    - Writing to the storage will be pended while they have conflicts after replication.
+
 ### 0.16.0
 - Now hidden files need not be scanned. Changes will be detected automatically.
   - If you want it to back to its previous behaviour, please disable `Monitor changes to internal files`.