diff --git a/common-tools/clas-geometry/pom.xml b/common-tools/clas-geometry/pom.xml
index 74395e0fa..7b58f29b7 100644
--- a/common-tools/clas-geometry/pom.xml
+++ b/common-tools/clas-geometry/pom.xml
@@ -17,7 +17,11 @@
org.openjfx
javafx-controls
- 24-ea+19
+<<<<<<< HEAD
+ 23
+=======
+ 24-ea+5
+>>>>>>> d4e3960bd (build(deps): bump org.openjfx:javafx-controls from 22.0.2 to 24-ea+5)
org.jlab.ccdbrcdb
diff --git a/common-tools/clas-jcsg/pom.xml b/common-tools/clas-jcsg/pom.xml
index b45cb7d29..84cf15d4d 100644
--- a/common-tools/clas-jcsg/pom.xml
+++ b/common-tools/clas-jcsg/pom.xml
@@ -17,12 +17,12 @@
org.openjfx
javafx-controls
- 24-ea+19
+ 24-ea+5
org.openjfx
javafx-fxml
- 24-ea+19
+ 24-ea+5
org.jlab.clas