Fixing merge issues from sync

src/google/protobuf/compiler/csharp/csharp_map_field.cc

@@ -88,7 +88,7 @@ void MapFieldGenerator::GenerateMembers(io::Printer* printer) {
 void MapFieldGenerator::GenerateMergingCode(io::Printer* printer) {
   printer->Print(
       variables_,
-      "$name$_.Add(other.$name$_);\n");
+      "$name$_.MergeFrom(other.$name$_);\n");
 }
 
 void MapFieldGenerator::GenerateParsingCode(io::Printer* printer) {

src/google/protobuf/json/internal/lexer_test.cc

@@ -160,6 +160,7 @@ struct Value {
         return Value{std::move(obj)};
       }
     }
+    return absl::InternalError("Unrecognized kind in lexer");
   }
 
   friend std::ostream& operator<<(std::ostream& os, const Value& v) {