diff --git a/.gitattributes b/.gitattributes
index 276cc7709..21bc439bf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,5 @@
 CHANGELOG.md merge=union
 README.md merge=union
+go.sum merge=union
 plugins/inputs/all/all.go merge=union
 plugins/outputs/all/all.go merge=union