diff --git a/parquet-hadoop/pom.xml b/parquet-hadoop/pom.xml
index 4c313b5377..902888e136 100644
--- a/parquet-hadoop/pom.xml
+++ b/parquet-hadoop/pom.xml
@@ -196,7 +196,7 @@
com.squareup.okhttp3
okhttp-jvm
- 5.4.0
+ 5.5.1
test
diff --git a/pom.xml b/pom.xml
index c87a9dcd6c..37f44f6d0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,11 @@
2.3
1.82
1.12
- 1.5.7-15
+<<<<<<< HEAD
+ 1.5.7-24
+=======
+ 1.5.7-24
+>>>>>>> cec62500 (Bump com.github.luben:zstd-jni from 1.5.7-23 to 1.5.7-24 (#3918))
1.15.0
3.0.2
3.20.0