diff --git a/src/scripts/merge_tools/merging b/src/scripts/merge_tools/merging
index 54b3dccf20..6ff59feee5 160000
--- a/src/scripts/merge_tools/merging
+++ b/src/scripts/merge_tools/merging
@@ -1 +1 @@
-Subproject commit 54b3dccf20f8baba0e63679babb1edf363b24f2d
+Subproject commit 6ff59feee50f1158cafe06cf2980b18cd09f17d1