diff --git a/build.gradle.kts b/build.gradle.kts
index 8ca20876..ba87b6f4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,13 +5,8 @@ buildscript {
     }
 
     dependencies {
-<<<<<<< agp
         classpath("com.android.tools.build:gradle:8.4.0")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")
-=======
-        classpath("com.android.tools.build:gradle:8.2.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23")
->>>>>>> master
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10")
         // Universal build config
         classpath("com.codingfeline.buildkonfig:buildkonfig-gradle-plugin:0.15.1")