Practicing merge conflicts! project creation date: 2022-10-26 author: Jean-Sébastien Marier Test This will hopefully work. And here's another line. And another line. Add line 9. Add line 10. Add line 13. Add line 14. Add line 15. Add line 16.