diff --git a/.travis.yml b/.travis.yml
index 4da36007..8e9475a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,13 @@ before_install:
   - "git fetch --tags"
   - "export PATH=${PATH}:./vendor/bundle"
 
+<<<<<<< update/scala-library-2.13.6
+scala_212: &scala_212 2.12.12
+scala_213: &scala_213 2.13.6
+=======
 scala_212: &scala_212 2.12.14
 scala_213: &scala_213 2.13.3
+>>>>>>> update-versions
 
 language: scala
 services:
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 1e58aa8f..f71246df 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -16,8 +16,8 @@ object dependencies {
   val withTests : String = "compile->compile;test->test"
   val inTestOnly : String = "test->test"
 
-  val scala212 = "2.12.14"
-  val scala213 = "2.13.3"
+  val scala212 = "2.12.12"
+  val scala213 = "2.13.6"
 
   lazy val JsTest = config("js").extend(Test)
   lazy val JvmTest = config("jvm").extend(Test)