Fixed merge conflict

UPGRADING.md

@@ -4,17 +4,11 @@ Upgrading
 This document summarizes the environmental changes that need to be made when
 upgrading IRIDA that cannot be automated.
 
-<<<<<<< Updated upstream
-22.09 to 23.10
---------------
-* This upgrade changes the Java version to Java 17.  To upgrade, follow the install instructions for your system in <https://phac-nml.github.io/irida-documentation/administrator/web/#prerequisite-install-instructions>.
-=======
 
 23.10 to 24.12
 --------------
 * This upgrade changes the Java version to Java 17.  To upgrade, follow the install instructions for your system in <https://phac-nml.github.io/irida-documentation/administrator/web/#prerequisite-install-instructions>.
 * Tomcat 9 (or another Servlet 3.1 compatible servlet container) is required for this IRIDA version.  Systems using Tomcat 8 must be upgraded before deploying this update.
->>>>>>> Stashed changes
 
 22.09 to 23.10
 --------------