Fix CHANGES.txt and delete .orig files from merge conflict

CHANGES.txt

@@ -7,6 +7,14 @@
   * Fixed crash in ThreadLocalStorage for pre-C++17 compilers on 32-bit ARM.
   * Clarified that JSON API non-OK statuses are not a stable API.
 
+  Kotlin
+  * Kotlin generated code comments now use kdoc format instead of javadoc.
+  * Escape keywords in package names in proto generated code
+
+  Java
+  * Performance improvement for repeated use of FieldMaskUtil#merge by caching
+    constructed FieldMaskTrees.
+
 2022-07-25 version 21.4 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
 
   C++
@@ -143,6 +151,7 @@
   Java
   * Update protobuf_version.bzl to separate protoc and per-language java … (#9900)
   * 6x speedup in ArrayEncoder.writeUInt32NotTag
+  * Java generated code is no longer compatible with runtimes 2.6.1 and earlier
 
   Python
   * Increment python major version to 4 in version.json for python upb (#9926)
@@ -154,6 +163,7 @@
   * Due to the breaking changes for Python, the major version number for Python
     has been incremented.
   * The binary wheel for macOS now supports Apple silicon.
+  * In TextFormat, transform UnicodeDecodeError into ParseError.
 
 
   PHP

csharp/src/Google.Protobuf/Google.Protobuf.csproj.orig

@@ -1,57 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
-    <Copyright>Copyright 2015, Google Inc.</Copyright>
-    <AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
-<<<<<<< HEAD
-    <VersionPrefix>3.21.3</VersionPrefix>
-    <LangVersion>10.0</LangVersion>
-=======
-    <VersionPrefix>3.21.4</VersionPrefix>
-    <!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence -->
-    <LangVersion>7.2</LangVersion>
->>>>>>> upstream/21.x
-    <Authors>Google Inc.</Authors>
-    <TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyOriginatorKeyFile>../../keys/Google.Protobuf.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <PackageTags>Protocol;Buffers;Binary;Serialization;Format;Google;proto;proto3</PackageTags>
-    <PackageReleaseNotes>C# proto3 support</PackageReleaseNotes>
-    <PackageProjectUrl>https://github.com/protocolbuffers/protobuf</PackageProjectUrl>
-    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/protocolbuffers/protobuf.git</RepositoryUrl>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <!-- Include PDB in the built .nupkg -->
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <IsTrimmable>true</IsTrimmable>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <DefineConstants>$(DefineConstants);GOOGLE_PROTOBUF_SUPPORT_FAST_STRING</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net50' ">
-    <DefineConstants>$(DefineConstants);GOOGLE_PROTOBUF_SUPPORT_FAST_STRING;GOOGLE_PROTOBUF_SIMD</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" Version="1.0.0"/>
-    <!-- Needed for the net45 build to work on Unix. See https://github.com/dotnet/designs/pull/33 -->
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0"/>
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'netstandard1.1' ">
-    <PackageReference Include="System.Memory" Version="4.5.3"/>
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="System.Memory" Version="4.5.3"/>
-    <!-- Needed for netcoreapp3.1 to work correctly. .NET is not able to load the assembly without this -->
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2"/>
-  </ItemGroup>
-
-</Project>

version.json.orig

@@ -1,33 +0,0 @@
-{
-<<<<<<< HEAD
-    "main": {
-        "protoc_version": "22-dev",
-=======
-    "21.x": {
-        "protoc_version": "21.4",
->>>>>>> upstream/21.x
-        "lts": false,
-        "date": "2022-07-25",
-        "languages": {
-<<<<<<< HEAD
-            "cpp": "3.22-dev",
-            "csharp": "3.22-dev",
-            "java": "3.22-dev",
-            "javascript": "3.22-dev",
-            "objectivec": "3.22-dev",
-            "php": "3.22-dev",
-            "python": "4.22-dev",
-            "ruby": "3.22-dev"
-=======
-            "cpp": "3.21.4",
-            "csharp": "3.21.4",
-            "java": "3.21.4",
-            "javascript": "3.21.4",
-            "objectivec": "3.21.4",
-            "php": "3.21.4",
-            "python": "4.21.4",
-            "ruby": "3.21.4"
->>>>>>> upstream/21.x
-        }
-    }
-}