Add changes to CHANGES.txt

CHANGES.txt

@@ -1,3 +1,16 @@
+Unreleased Changes (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
+  Protocol Compiler
+  * Stop emitting boilerplate {Copy/Merge}From in each ProtoBuf class
+  * split the accessor annotations according to their operation
+  * introduce proto message injector
+  * let proto message injector decide whether to calculate address info based on field descriptor and access type.
+  * Disable LITE_RUNTIME injector annotations
+  * move callback and @protoc_insertion_point after internal set of enum fields
+  * Improve ExtractFieldInfo codegen for string fields with oneof or default value
+  * Rename MessageInjector to FieldAccessListener
+  * Change the API of FieldAccessListener to support callbacks for info extraction
+  * make field_access_injector private
+
 2021-05-07 version 3.17.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
 
   Protocol Compiler

java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt

@@ -495,20 +495,12 @@ class Proto2Test {
         this[UnittestProto.repeatedBytesExtension] += toBytes("316")
         this[UnittestProto.repeatedGroupExtension] += repeatedGroupExtension { a = 317 }
         this[UnittestProto.repeatedNestedMessageExtension] +=
-<<<<<<< HEAD
 	  TestAllTypesKt.nestedMessage { bb = 318 }
-=======
-          TestAllTypesKt.nestedMessage { bb = 318 }
->>>>>>> refs/tags/sync-piper
         this[UnittestProto.repeatedForeignMessageExtension] += foreignMessage { c = 319 }
         this[UnittestProto.repeatedImportMessageExtension] +=
           ImportMessage.newBuilder().setD(320).build()
         this[UnittestProto.repeatedLazyMessageExtension] +=
-<<<<<<< HEAD
 	  TestAllTypesKt.nestedMessage { bb = 327 }
-=======
-          TestAllTypesKt.nestedMessage { bb = 327 }
->>>>>>> refs/tags/sync-piper
         this[UnittestProto.repeatedNestedEnumExtension] += NestedEnum.BAZ
         this[UnittestProto.repeatedForeignEnumExtension] += ForeignEnum.FOREIGN_BAZ
         this[UnittestProto.repeatedImportEnumExtension] += ImportEnum.IMPORT_BAZ