diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5880a251b..6fa26c7c3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,7 +18,7 @@ adventure-platform-bukkit = "4.0.0"
 
 # Plugins
 worldedit = "7.2.7"
-fawe = "1.17-390"
+fawe = "1.17-397"
 vault = "1.7.1"
 placeholderapi = "2.10.10"
 luckperms = "5.3"
diff --git a/renovate.json b/renovate.json
index 06f7da361..577d311e1 100644
--- a/renovate.json
+++ b/renovate.json
@@ -15,5 +15,6 @@
     "on monday after 9am"
   ],
   "labels": ["Renovate"],
-  "commitMessagePrefix": "build: "
+  "commitMessagePrefix": "build: ",
+  "rebaseWhen": "conflicted"
 }