4 files changed, 4 insertions, 46 deletions
diff --git a/test-nsc/files/run/arrays.scala b/test-nsc/files/run/arrays.scala
index 9e9c3c065b..eee62afcb3 100644
--- a/test-nsc/files/run/arrays.scala
+++ b/test-nsc/files/run/arrays.scala
@@ -205,7 +205,7 @@ object Test {
   val a4: String  = "a-z";
   val a5: Symbol  = 'token;
   val a6: HashMap = new HashMap();
-  val a7: TreeMap = scala.collection.immutable.TreeMap.Empty;
+  val a7: TreeMap = scala.collection.immutable.TreeMap.Empty[Int, Any];
   val a8: Strings = List("a", "z");
 
   val v0: Unit    = ();
diff --git a/test-nsc/files/run/bugs.scala b/test-nsc/files/run/bugs.scala
index 18c17c1501..659b49f825 100755
--- a/test-nsc/files/run/bugs.scala
+++ b/test-nsc/files/run/bugs.scala
@@ -28,24 +28,14 @@ object Bug98Test {
 class Bug120A(x: Int) {
   Console.println("A");
 }
-<<<<<<< bugs.scala
+
 trait Bug120B {
   System.out.println("B");
-=======
-class Bug120B(x: Int) {
-  Console.println("B");
->>>>>>> 1.25
 }
 class Bug120C(x: Int)
-<<<<<<< bugs.scala
     extends Bug120A(Bug120Test.print("one", 1))
     with Bug120B {
   System.out.println("C");
-=======
-    with Bug120A(Bug120Test.print("one", 1))
-    with Bug120B(Bug120Test.print("two", 2)) {
-  Console.println("C");
->>>>>>> 1.25
 }
 object Bug120Test {
   def print[A](str: String, res: A): A = {
@@ -79,17 +69,10 @@ abstract class Bug142Foo2 { class Inner; def foo: Inner = {Console.println("ok")
 abstract class Bug142Foo3 { type  Inner; def foo: Inner; foo; }
 abstract class Bug142Foo4 { type  Inner; def foo: Inner = {Console.println("ok"); null.asInstanceOf[Inner]}; }
 
-<<<<<<< bugs.scala
 trait Bug142Bar1 { type  Inner; def foo: Inner = {System.out.println("ok"); null.asInstanceOf[Inner]}; }
 trait Bug142Bar2 { type  Inner; def foo: Inner; foo; }
 trait Bug142Bar3 { class Inner; def foo: Inner = {System.out.println("ok"); null}; }
 trait Bug142Bar4 { class Inner; def foo: Inner; foo; }
-=======
-abstract class Bug142Bar1 { type  Inner; def foo: Inner = {Console.println("ok"); null.asInstanceOf[Inner]}; }
-abstract class Bug142Bar2 { type  Inner; def foo: Inner; foo; }
-abstract class Bug142Bar3 { class Inner; def foo: Inner = {Console.println("ok"); null}; }
-abstract class Bug142Bar4 { class Inner; def foo: Inner; foo; }
->>>>>>> 1.25
 
 object Bug142Test1 extends Bug142Foo1 with Bug142Bar1 {def main(args:Array[String]):Unit=();}
 object Bug142Test2 extends Bug142Foo2 with Bug142Bar2 {def main(args:Array[String]):Unit=();}
@@ -422,15 +405,9 @@ trait Bug396B extends Bug396A {
     override def run = { super.run; Console.println("B"); }
   }
 }
-<<<<<<< bugs.scala
 trait Bug396C extends Bug396A {
   trait I extends super.I {
     override def run = { super.run; System.out.println("C"); }
-=======
-class Bug396C extends Bug396A {
-  class I extends super.I {
-    override def run = { super.run; Console.println("C"); }
->>>>>>> 1.25
   }
 }
 object Bug396Test extends Application with Bug396B with Bug396C {
diff --git a/test-nsc/files/run/mixins.scala b/test-nsc/files/run/mixins.scala
index f896551108..bbc20d33d2 100755
--- a/test-nsc/files/run/mixins.scala
+++ b/test-nsc/files/run/mixins.scala
@@ -2,6 +2,8 @@
 
 // Test 1: "super" coming from mixins
 
+import Console._;
+
 object Test1 {
   class A {
     def f = "A::f";
@@ -58,24 +60,13 @@ object Test3 {
     Console.println("A");
   }
 
-<<<<<<< mixins.scala
   trait B {
     println("B");
-=======
-  class B(x: Unit) {
-    Console.println("B");
->>>>>>> 1.5
   }
 
-<<<<<<< mixins.scala
   class C extends A({ println("one"); }, { println("two"); })
           with B {
     println("C");
-=======
-  class C with A({ Console.println("one"); }, { Console.println("two"); })
-          with B({ Console.println("three"); }) {
-    Console.println("C");
->>>>>>> 1.5
   }
 
   def test() = {
diff --git a/test-nsc/files/run/runtime.scala b/test-nsc/files/run/runtime.scala
index 8dca7229d2..30f32b7cba 100755
--- a/test-nsc/files/run/runtime.scala
+++ b/test-nsc/files/run/runtime.scala
@@ -98,26 +98,16 @@ package test2 {
     def run = Console.println("A");
   }
 
-<<<<<<< runtime.scala
   trait M0 extends A {
     override def run = { super.run; System.out.println("M0"); }
-=======
-  class M0 extends A {
-    override def run = { super.run; Console.println("M0"); }
->>>>>>> 1.9
   }
 
   class M1 extends M0 {
     override def run = { super.run; Console.println("M1"); }
   }
 
-<<<<<<< runtime.scala
   trait N0 extends A {
     override def run = { super.run; System.out.println("N0"); }
-=======
-  class N0 extends A {
-    override def run = { super.run; Console.println("N0"); }
->>>>>>> 1.9
   }
 
   class N1 extends N0 {