diff --git a/common/.gitconfig b/common/.gitconfig
index 9475d42..57f4b64 100644
--- a/common/.gitconfig
+++ b/common/.gitconfig
@@ -251,3 +251,5 @@
 	name = VectorKappa
 	email = piotrpatalong@gmail.com
 	signingkey = 0917E6568B3A9A02
+[mergetool]
+	keepBackup = true