diff --git a/build.gradle b/build.gradle
index 25f393ecc2..7fe06b7714 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,8 +18,13 @@ plugins {
   id 'io.spinnaker.project' version "$spinnakerGradleVersion" apply false
   id "org.jetbrains.kotlin.jvm" version "$kotlinVersion" apply false
   id "org.jetbrains.kotlin.plugin.allopen" version "$kotlinVersion" apply false
+<<<<<<< HEAD
   id "io.gitlab.arturbosch.detekt" version "1.7.4" apply false
   id "org.jetbrains.dokka" version "1.4.10" apply false
+=======
+  id "io.gitlab.arturbosch.detekt" version "1.17.1" apply false
+  id "org.jetbrains.dokka" version "1.4.32" apply false
+>>>>>>> 1412bd8ec (chore(dependencies): Update dokka version to version present in maven central (#4196))
 }
 
 allprojects {
diff --git a/orca-api/orca-api.gradle b/orca-api/orca-api.gradle
index a8c65ddfe7..707a856c79 100644
--- a/orca-api/orca-api.gradle
+++ b/orca-api/orca-api.gradle
@@ -44,7 +44,7 @@ dependencies {
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-api")
   testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
 
-  dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.4.10")
+  dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.4.32")
 
   sampleImplementation(sourceSets.main.runtimeClasspath)
 }