diff --git a/.gitattributes b/.gitattributes
index 297d227c811ab..eea5a1ec86593 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,3 +8,4 @@
 *.gen.yaml linguist-generated=true
 *.gen.json linguist-generated=true
 *_pb2.py linguist-generated=true
+go.sum merge=union
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index e41057a75651d..8280a87979879 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-78d4a03042d695220b4ade5c17f071898d466b58
+d40d1b75c481bb08a4e5de631c26a4352d7039fd