Fix merge conflicts and reorder keynoters

Fixes merge conflict leftovers in keynoter markdown files and sets display order to Pablo, Łukasz, Guido.

Author: nikoshell

src/content/keynoters/guido.md

@@ -2,13 +2,9 @@
 name: Guido van Rossum
 image: ./guido.jpg
 tagline: Creator of Python
-<<<<<<< HEAD
 bio:
   "The creator of Python, now a CPython core developer at Microsoft. Continues
   to contribute to the language he started in 1989 as a side project."
-order: 2
-=======
-bio: "The creator of Python, now a CPython core developer at Microsoft. Continues to contribute to the language he started in 1989 as a side project."
 order: 3
->>>>>>> 378cb50b (Add photos to keynoter entries)
 ---
+

src/content/keynoters/lukasz.md

@@ -2,13 +2,9 @@
 name: Łukasz Langa
 image: ./lukasz.webp
 tagline: CPython Core Developer & PEP 703 (nogil) author
-<<<<<<< HEAD
 bio:
   "Python core developer, creator of PEP 703 (nogil), and the current Python
   Release Manager. Driving performance and concurrency improvements in CPython."
-order: 3
-=======
-bio: "Python core developer, creator of PEP 703 (nogil), and the current Python Release Manager. Driving performance and concurrency improvements in CPython."
 order: 2
->>>>>>> 378cb50b (Add photos to keynoter entries)
 ---
+