fix conflicts

Author: sofisl

.release-please-manifest.json

@@ -311,4 +311,5 @@
   "src/apis/managedkafka": "0.2.0",
   "src/apis/observability": "0.1.0",
   "src/apis/storagebatchoperations": "0.1.0"
-}
+}
+