diff --git a/CHANGELOG.md b/CHANGELOG.md
index 888d24ce9..024c9d1bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,8 +27,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - #1430 - Adds the Fenix Snackbar
 - #1397 - Adds favicons to the history view
 - #1375 - Added setting for turning off history suggestions
+- #1139 - Resolved a 170ms delay on cold start
 
->>>>>>> For #1397 - Updates changelog
 ### Changed
 - #1429 - Updated site permissions ui for MVP
 ### Removed
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 89233bd45..00cec3506 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -118,6 +118,10 @@ android {
     lintOptions {
         lintConfig file("lint.xml")
     }
+
+    packagingOptions {
+        exclude 'META-INF/atomicfu.kotlin_module'
+    }
 }
 
 android.applicationVariants.all { variant ->
@@ -246,6 +250,7 @@ dependencies {
     implementation project(':architecture')
 
     implementation Deps.kotlin_stdlib
+    implementation Deps.kotlin_coroutines
     implementation Deps.androidx_appcompat
     implementation Deps.androidx_constraintlayout
 
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 2191a0562..b40987508 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -4,6 +4,7 @@
 
 private object Versions {
     const val kotlin = "1.3.11"
+    const val coroutines = "1.2.0-alpha-2"
     const val android_gradle_plugin = "3.3.2"
     const val rxAndroid = "2.1.0"
     const val rxKotlin = "2.3.0"
@@ -48,6 +49,7 @@ object Deps {
     const val tools_kotlingradle = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
     const val tools_appservicesgradle = "org.mozilla.appservices:gradle-plugin:${Versions.appservices_gradle_plugin}"
     const val kotlin_stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${Versions.kotlin}"
+    const val kotlin_coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.coroutines}"
 
     const val allopen = "org.jetbrains.kotlin:kotlin-allopen:${Versions.kotlin}"