Merge pull request #9283 from guggero/fix-release-notes

docs: fix release notes

Author: guggero

docs/release-notes/release-notes-0.19.0.md

@@ -202,10 +202,5 @@ The underlying functionality between those two options remain the same.
 * Oliver Gugger
 * Pins
 * Viktor Tigerström
-<<<<<<< HEAD
 * Yong Yu
 * Ziggie
-
-=======
-* Ziggie
->>>>>>> 5a6264b6a (docs: update release notes)