diff --git a/.gitattributes b/.gitattributes
index 56d6fecf4b8..dd94a48f8e7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,3 +2,4 @@ contrib/* linguist-vendored
 *.h linguist-language=C++
 tests/queries/0_stateless/data_json/* binary
 tests/queries/0_stateless/*.reference -crlf
+src/Core/SettingsChangesHistory.cpp merge=union