resolve merge conflict

diff --cc 2023/includes/recent-updates.html
index 253d48e7e21c1d9a2aa039a9438f77fd68ab6b0c,9241961c2d031cbb2a5dd0405f1b99519fabe39f..19c6be5a13df0bfc2f303a32cc2991f9be3647cb
--- 1/2023/includes/recent-updates.html
--- 2/2023/includes/recent-updates.html
+++ b/2023/includes/recent-updates.html
@@@ -5,9 -5,9 +5,11 @@@
        <!--   <li></li> -->
        <!--  </ul> -->
  </ul>
 +<li><strong>11/30/2022</strong> <a href="https://www.fsf.org/blogs/community/fifteen-years-of-libreplanet-register-now-to-join-us-on-march-18-and-19">Fifteen years of LibrePlanet: Register now to join us on March 18 and
 +    19</a></li>
  
+ <li><strong>11/21/2022</strong> <a href="https://www.fsf.org/blogs/community/libreplanet-cfs-closing-very-soon-submit-today"> LibrePlanet CFS closing very soon. Submit today!</a></li>
+ 
  <li><strong>11/02/2022</strong> <a href="https://www.fsf.org/blogs/community/libreplanet-2023-will-be-held-march-18-19-cfs-extended-to-november-23"> LibrePlanet 2023 will be held March 18-19, CFS extended to November 23</a></li>
  
  <li><strong>10/19/2022</strong> <a href="https://www.fsf.org/blogs/community/libreplanet-2023-remember-to-submit-your-session-by-november-2"> Remember to submit your session by Nov 2</a></li>