ChangeLog conflict fix

Author: aheejin

ChangeLog.md

@@ -20,13 +20,15 @@ See docs/process.md for more on how version tagging works.
 
 6.0.6 (in development)
 ----------------------
+- libcxx and libcxxabi were updated to LLVM 22.1.8. (#27428)
 
 6.0.5 - 07/29/26
 ----------------
 - Revert #27397, which changed the way config keys such as NODE_JS were parsed
   when reading the config file.  This change broke emsdk installations that
   contained spaces. (#27421)
 - libcxx, libcxxabi and OpenMP were updated to LLVM 22.1.8. (#27428, #27437)
+- OpenMP was updated to LLVM 22.1.8 (#27437)
 
 6.0.4 - 07/24/26
 ----------------