diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b87908ef598..ff1de89dc5c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -34,9 +34,15 @@ sqldelight = "2.0.0"
 sqlcipher-android = "4.5.5"
 pbandk = "0.14.2"
 turbine = "1.0.0"
+<<<<<<< HEAD
 avs = "9.5.4"
 jna = "5.13.0"
 core-crypto = "1.0.0-rc.17"
+=======
+avs = "9.2.22"
+jna = "5.6.0"
+core-crypto = "1.0.0-pre.6+v1-schemafix-004"
+>>>>>>> f071c035ea (chore: cc version with schema fix (#2204))
 core-crypto-multiplatform = "0.6.0-rc.3-multiplatform-pre1"
 completeKotlin = "1.1.0"
 desugar-jdk = "2.0.3"