diff --git a/app/build.gradle b/app/build.gradle
index 8a457d51..39943dfa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,8 +42,8 @@ android {
         applicationId "com.nutomic.syncthingandroid"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 4324
-        versionName "1.22.1"
+        versionCode 4325
+        versionName "1.22.1.1"
         testApplicationId 'com.nutomic.syncthingandroid.test'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
diff --git a/app/src/main/play/release-notes/en-GB/default.txt b/app/src/main/play/release-notes/en-GB/default.txt
index b0ab3acb..5f22e581 100644
--- a/app/src/main/play/release-notes/en-GB/default.txt
+++ b/app/src/main/play/release-notes/en-GB/default.txt
@@ -1,3 +1,4 @@
 * Update Syncthing to v1.22.1 ( https://github.com/syncthing/syncthing/releases/tag/v1.22.1 )
+* Don't create spurious conflicts (cherry-picked on top of syncthing v1.22.1)
 * add preference to run always (ignore run conditions) #1823
 * Remove Syncthing from Recents after pressing Exit #1805
diff --git a/syncthing/src/github.com/syncthing/syncthing b/syncthing/src/github.com/syncthing/syncthing
index abb921ac..15c0afec 160000
--- a/syncthing/src/github.com/syncthing/syncthing
+++ b/syncthing/src/github.com/syncthing/syncthing
@@ -1 +1 @@
-Subproject commit abb921acbc21191f18ac4a6884f5296acb216e86
+Subproject commit 15c0afec055b935870b05af4483a0598d2e84dbb