diff --git a/.gitattributes b/.gitattributes
index 1631d45617f0..41cd99414353 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,3 +6,4 @@
 *.h linguist-language=C++
 *.cpp linguist-language=C++
 
+.*canary merge=keeplocal
\ No newline at end of file
diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 000000000000..fa0ead4d3537
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,3 @@
+[merge "keeplocal"]
+	name = Always keep local file during merge
+	driver = true