diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ca27e8b19e..4791f8e4e9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,20 @@ bouncycastle = '1.70'
 fileupload = '0.0.5'
 jetty = '9.4.51.v20230217'
 logback-json-classic = '0.1.5'
+<<<<<<< HEAD
 managed-alexa-ask-sdk = "2.69.0"
+=======
+
+micronaut-discovery = '4.0.0-M1'
+micronaut-groovy = '4.0.0-M1'
+micronaut-mongodb = '5.0.0-M1'
+micronaut-security = '4.0.0-M1'
+micronaut-serde = '2.0.0-M1'
+micronaut-views = '4.0.0-M1'
+micronaut-validation = "4.0.0-M2"
+
+managed-alexa-ask-sdk = "2.70.0"
+>>>>>>> 1b856119c (fix(deps): update managed-alexa-ask-sdk to v2.70.0 (#1673))
 managed-aws-java-sdk-v1 = '1.12.442'
 managed-aws-java-sdk-v2 = '2.20.39'
 managed-aws-lambda = '1.2.2'