diff --git a/.scalafmt.conf b/.scalafmt.conf
index 607bd8dd53..d09c394800 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 2.0.0-RC7
+version = 2.0.0
 
 style = defaultWithAlign
 
diff --git a/akka-stream/src/main/scala/akka/stream/impl/SubFlowImpl.scala b/akka-stream/src/main/scala/akka/stream/impl/SubFlowImpl.scala
index 6b6acbd3ca..6f75da9bb9 100644
--- a/akka-stream/src/main/scala/akka/stream/impl/SubFlowImpl.scala
+++ b/akka-stream/src/main/scala/akka/stream/impl/SubFlowImpl.scala
@@ -15,7 +15,7 @@ import language.higherKinds
  * INTERNAL API
  */
 @InternalApi private[akka] object SubFlowImpl {
-  trait MergeBack[In, F[+ _]] {
+  trait MergeBack[In, F[+_]] {
     def apply[T](f: Flow[In, T, NotUsed], breadth: Int): F[T]
   }
 }
@@ -23,7 +23,7 @@ import language.higherKinds
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] class SubFlowImpl[In, Out, Mat, F[+ _], C](
+@InternalApi private[akka] class SubFlowImpl[In, Out, Mat, F[+_], C](
     val subFlow: Flow[In, Out, NotUsed],
     mergeBackFunction: SubFlowImpl.MergeBack[In, F],
     finishFunction: Sink[In, NotUsed] => C)
diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/SubFlow.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/SubFlow.scala
index 4e269db0f9..c4d64aeb4e 100644
--- a/akka-stream/src/main/scala/akka/stream/scaladsl/SubFlow.scala
+++ b/akka-stream/src/main/scala/akka/stream/scaladsl/SubFlow.scala
@@ -13,7 +13,7 @@ import scala.annotation.unchecked.uncheckedVariance
  * SubFlows cannot contribute to the super-flow’s materialized value since they
  * are materialized later, during the runtime of the flow graph processing.
  */
-trait SubFlow[+Out, +Mat, +F[+ _], C] extends FlowOps[Out, Mat] {
+trait SubFlow[+Out, +Mat, +F[+_], C] extends FlowOps[Out, Mat] {
 
   override type Repr[+T] = SubFlow[T, Mat @uncheckedVariance, F @uncheckedVariance, C @uncheckedVariance]
   override type Closed = C
diff --git a/project/plugins.sbt b/project/plugins.sbt
index d8163998ed..43f5439104 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -4,7 +4,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.4.0")
 //#sbt-multi-jvm
 
 addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.4.1")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.0")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.3")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.5")
 addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.3.0")