diff --git a/go.mod b/go.mod
index 95c86eb6..756e37a7 100644
--- a/go.mod
+++ b/go.mod
@@ -26,8 +26,13 @@ require (
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/tools v0.22.0
 	golang.org/x/vuln v1.1.2
+<<<<<<< HEAD
 	google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f
 	google.golang.org/grpc v1.60.1
+=======
+	google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80
+	google.golang.org/grpc v1.62.1
+>>>>>>> 242fdf2 (chore(deps): bump golang.org/x/vuln from 1.0.4 to 1.1.2 (#558))
 	google.golang.org/protobuf v1.32.0
 	mvdan.cc/gofumpt v0.6.0
 )