diff --git a/manifests.json b/manifests.json
index c640a61..f6c7025 100644
--- a/manifests.json
+++ b/manifests.json
@@ -734,7 +734,7 @@
 	"joplin-plugin-conflict-resolution": {
 		"manifest_version": 1,
 		"id": "joplin-plugin-conflict-resolution",
-		"app_min_version": "2.0.9",
+		"app_min_version": "2.0.10",
 		"version": "1.2.2",
 		"name": "Conflict Resolution",
 		"description": "A plugin that makes process of resolving conflicts easier.",
@@ -742,8 +742,8 @@
 		"homepage_url": "https://discourse.joplinapp.org/t/plugin-conflict-resolution/19204",
 		"repository_url": "https://github.com/joplin/plugin-conflict-resolution",
 		"keywords": [],
-		"_publish_hash": "sha256:84ee143ff4099dd93b31b0ab3d3619b1c272225de25ca2b745fbb02722563b9c",
-		"_publish_commit": "master:19de0ffd803ad5980446d7e6602fa138648246a4",
+		"_publish_hash": "sha256:75c44bc3d7408733f9d25d187bef55b418ac0389c0b3a307e862aea42ca11ef7",
+		"_publish_commit": "master:9071f7966112a162acdae383272212ef08a6b8ea",
 		"_npm_package_name": "joplin-plugin-conflict-resolution"
 	},
 	"com.gitlab.BeatLink.joplin-plugin-repeating-todos": {
diff --git a/plugins/joplin-plugin-conflict-resolution/manifest.json b/plugins/joplin-plugin-conflict-resolution/manifest.json
index 4d4334e..71a26af 100644
--- a/plugins/joplin-plugin-conflict-resolution/manifest.json
+++ b/plugins/joplin-plugin-conflict-resolution/manifest.json
@@ -1,7 +1,7 @@
 {
 	"manifest_version": 1,
 	"id": "joplin-plugin-conflict-resolution",
-	"app_min_version": "2.0.9",
+	"app_min_version": "2.0.10",
 	"version": "1.2.2",
 	"name": "Conflict Resolution",
 	"description": "A plugin that makes process of resolving conflicts easier.",
@@ -9,7 +9,7 @@
 	"homepage_url": "https://discourse.joplinapp.org/t/plugin-conflict-resolution/19204",
 	"repository_url": "https://github.com/joplin/plugin-conflict-resolution",
 	"keywords": [],
-	"_publish_hash": "sha256:84ee143ff4099dd93b31b0ab3d3619b1c272225de25ca2b745fbb02722563b9c",
-	"_publish_commit": "master:19de0ffd803ad5980446d7e6602fa138648246a4",
+	"_publish_hash": "sha256:75c44bc3d7408733f9d25d187bef55b418ac0389c0b3a307e862aea42ca11ef7",
+	"_publish_commit": "master:9071f7966112a162acdae383272212ef08a6b8ea",
 	"_npm_package_name": "joplin-plugin-conflict-resolution"
 }
\ No newline at end of file
diff --git a/plugins/joplin-plugin-conflict-resolution/plugin.jpl b/plugins/joplin-plugin-conflict-resolution/plugin.jpl
index 5d1f6b0..732880d 100644
Binary files a/plugins/joplin-plugin-conflict-resolution/plugin.jpl and b/plugins/joplin-plugin-conflict-resolution/plugin.jpl differ