Fixed ReleaseNotes.rst

Author: AidanGoldfarb

clang/docs/ReleaseNotes.rst

@@ -387,15 +387,8 @@ C Language Changes
 ------------------
 
 - Extend clang's ``<limits.h>`` to define ``LONG_LONG_*`` macros for Android's bionic.
-<<<<<<< HEAD
-<<<<<<< HEAD
 - Macro ``__STDC_NO_THREADS__`` is no longer necessary for MSVC 2022 1939 and later.
-=======
-- Added support for the ``__nullptr`` keyword. 
->>>>>>> cfda1e8d3bf6 (Update ReleaseNotes.rst)
-=======
 - Exposed the the ``__nullptr`` keyword as an alias for ``nullptr`` in all C language modes.
->>>>>>> 8d00a2c3e77a (Update clang/docs/ReleaseNotes.rst)
 
 C2y Feature Support
 ^^^^^^^^^^^^^^^^^^^