Clean up cruft in changelog.

Author: jaraco

CHANGES.rst

@@ -5,7 +5,6 @@ v63.4.0
 Changes
 ^^^^^^^
 * #2971: ``upload_docs`` command is deprecated once again.
-* #3475: Merge with pypa/distutils@129480b, including substantial delinting and cleanup, some refactoring around compiler logic, better messaging in cygwincompiler (pypa/distutils#161).
 
 Documentation changes
 ^^^^^^^^^^^^^^^^^^^^^
@@ -25,11 +24,6 @@ v63.3.0
 
 Changes
 ^^^^^^^
-* #3460: <<<<<<< HEAD
-  Limit the scope of the _distutils_hack workaround for pip.
-  =======
-  Remove the pip workaround in _distutils_hack.
-  >>>>>>> 46344cf0 (Remove pip workaround in _distutils_hack.)
 * #3475: Merge with pypa/distutils@129480b, including substantial delinting and cleanup, some refactoring around compiler logic, better messaging in cygwincompiler (pypa/distutils#161).