Workaround merge issue

Author: nicolasstucki

compiler/test/dotc/scala-collections.blacklist

@@ -73,11 +73,6 @@
 #    |                          ^
 #    |                          early definitions are not supported; use trait parameters instead
 
-../scala-scala/src/library/scala/collection/parallel/mutable/ParTrieMap.scala
-# 136 |    it.iterated = this.iterated
-#     |    ^^^^^^^^^^^
-#     |    value `iterated` is not a member of scala.collection.concurrent.TrieMapIterator[K, V](it)
-
 ../scala-scala/src/library/scala/collection/parallel/package.scala
 # 75 |    implicit def factory2ops[From, Elem, To](bf: CanBuildFrom[From, Elem, To]) = new FactoryOps[From, Elem, To] {
 #     |    ^
@@ -228,4 +223,4 @@
 ../scala-scala/src/library/scala/util/Properties.scala
 ../scala-scala/src/library/scala/collection/immutable/HashSet.scala
 ../scala-scala/src/library/scala/collection/parallel/mutable/ParSetLike.scala
-../scala-scala/src/library/scala/collection/parallel/mutable/ParMapLike.scala
+../scala-scala/src/library/scala/collection/parallel/mutable/ParMapLike.scala

compiler/test/dotc/scala-collections.whitelist

@@ -482,6 +482,7 @@
 #../scala-scala/src/library/scala/collection/parallel/mutable/ParSetLike.scala
 # fails in callgraph (test)
 
+../scala-scala/src/library/scala/collection/parallel/mutable/ParTrieMap.scala
 ../scala-scala/src/library/scala/collection/parallel/mutable/UnrolledParArrayCombiner.scala
 ../scala-scala/src/library/scala/collection/parallel/ParSeq.scala
 ../scala-scala/src/library/scala/collection/parallel/ParSet.scala