@@ -294,10 +294,7 @@ PHP                                                                        NEWS
     (Nicolas Grekas)
   . Fixed convert.quoted-printable-decode decoding lowercase hex digits to
     the wrong byte. (Ilia Alshanetsky)
-<<<<<<< HEAD
-=======
   . Fixed boolean key handling in array_combine(). (arshidkv12)
->>>>>>> e17d42af53c (ext/standard: Fix boolean keys in array_combine())
 
 - Tidy:
   . Fixed a use-after-free when a tidyNode is used after its document is