Fix bad merge

Author: mpilquist

io/js/src/main/scala/fs2/io/compressionplatform.scala

@@ -45,10 +45,10 @@ private[io] trait compressionplatform {
 
         Stream
           .resource(suspendReadableAndRead() {
-            (deflateParams.header match {
+            deflateParams.header match {
               case ZLibParams.Header.GZIP => facade.zlib.createGzip(options)
               case ZLibParams.Header.ZLIB => facade.zlib.createDeflate(options)
-            })
+            }
           })
           .flatMap { case (deflate, out) =>
             out
@@ -66,10 +66,10 @@ private[io] trait compressionplatform {
 
         Stream
           .resource(suspendReadableAndRead() {
-            (inflateParams.header match {
+            inflateParams.header match {
               case ZLibParams.Header.GZIP => facade.zlib.createGunzip(options)
               case ZLibParams.Header.ZLIB => facade.zlib.createInflate(options)
-            })
+            }
           })
           .flatMap { case (inflate, out) =>
             out

io/js/src/main/scala/fs2/io/file/FilesPlatform.scala

@@ -97,13 +97,9 @@ private[fs2] trait FilesCompanionPlatform {
         permissions: Option[Permissions]
     ): F[Path] =
       F.fromPromise(
-<<<<<<< topic/scalafmt-3.5.7
-        F.delay(fsPromisesMod.mkdtemp(dir.fold(osMod.tmpdir())(_.toString) + Path.sep + prefix))
-=======
         F.delay(
           facade.fs.promises.mkdtemp(dir.fold(facade.os.tmpdir())(_.toString) + Path.sep + prefix)
         )
->>>>>>> main
       ).map(Path(_))
         .flatTap { path =>
           permissions