diff --git a/common-tools/clas-geometry/pom.xml b/common-tools/clas-geometry/pom.xml
index 2db5ed6b8..7b58f29b7 100644
--- a/common-tools/clas-geometry/pom.xml
+++ b/common-tools/clas-geometry/pom.xml
@@ -17,7 +17,11 @@
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-controls</artifactId>
+<<<<<<< HEAD
       <version>23</version>
+=======
+      <version>24-ea+5</version>
+>>>>>>> d4e3960bd (build(deps): bump org.openjfx:javafx-controls from 22.0.2 to 24-ea+5)
     </dependency>
     <dependency>
       <groupId>org.jlab.ccdbrcdb</groupId>
diff --git a/common-tools/clas-jcsg/pom.xml b/common-tools/clas-jcsg/pom.xml
index dac3f8c32..84cf15d4d 100644
--- a/common-tools/clas-jcsg/pom.xml
+++ b/common-tools/clas-jcsg/pom.xml
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-controls</artifactId>
-      <version>23</version>
+      <version>24-ea+5</version>
     </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>