diff --git a/akka-core/src/main/scala/actor/ActorRef.scala b/akka-core/src/main/scala/actor/ActorRef.scala
index 6a7efe80f1..68633c7d44 100644
--- a/akka-core/src/main/scala/actor/ActorRef.scala
+++ b/akka-core/src/main/scala/actor/ActorRef.scala
@@ -1338,7 +1338,7 @@ sealed class LocalActorRef private[akka](
       }
     }
   }
-
+  
   protected[akka] def restartLinkedActors(reason: Throwable) = guard.withGuard {
     linkedActorsAsList.foreach { actorRef =>
       if (actorRef.lifeCycle.isEmpty) actorRef.lifeCycle = Some(LifeCycle(Permanent))
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/ActiveObjectFailer.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/ActiveObjectFailer.java
index a95fe6c6c9..6e30a1a971 100644
--- a/akka-core/src/test/java/se/scalablesolutions/akka/actor/ActiveObjectFailer.java
+++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/ActiveObjectFailer.java
@@ -2,6 +2,6 @@ package se.scalablesolutions.akka.actor;
 
 public class ActiveObjectFailer implements java.io.Serializable { 
   public int fail() {
-    throw new RuntimeException("Expected exception; to test fault-tolerance");
+    throw new RuntimeException("expected");
   }
 }
diff --git a/akka-core/src/test/scala/NestedTransactionalActiveObjectSpec.scala b/akka-core/src/test/scala/NestedTransactionalActiveObjectSpec.scala
index f0bf3f6c02..7d0bfd902e 100644
--- a/akka-core/src/test/scala/NestedTransactionalActiveObjectSpec.scala
+++ b/akka-core/src/test/scala/NestedTransactionalActiveObjectSpec.scala
@@ -20,9 +20,15 @@ import se.scalablesolutions.akka.actor._
 /*
 @RunWith(classOf[JUnitRunner])
 class NestedTransactionalActiveObjectSpec extends
+<<<<<<< HEAD:akka-core/src/test/scala/NestedTransactionalActiveObjectSpec.scala
   Spec with
   ShouldMatchers with
   BeforeAndAfterAll {
+=======
+  Spec with 
+  ShouldMatchers with 
+  BeforeAndAfterAll {  
+>>>>>>> 38e8bea3fe6a7e9fcc9c5f353124144739bdc234:akka-core/src/test/scala/NestedTransactionalActiveObjectSpec.scala
 
   private val conf = new ActiveObjectConfigurator
   private var messageLog = ""
diff --git a/akka-core/src/test/scala/RemoteSupervisorSpec.scala b/akka-core/src/test/scala/RemoteSupervisorSpec.scala
index e1a0c80192..10f8c3bcf9 100644
--- a/akka-core/src/test/scala/RemoteSupervisorSpec.scala
+++ b/akka-core/src/test/scala/RemoteSupervisorSpec.scala
@@ -75,7 +75,7 @@ object Log {
 
 object RemoteSupervisorSpec {
   val HOSTNAME = "localhost"
-  val PORT = 9990
+  val PORT = 9988
   var server: RemoteServer = null
 }
 
diff --git a/akka-core/src/test/scala/RemoteTransactionalActiveObjectSpec.scala b/akka-core/src/test/scala/RemoteTransactionalActiveObjectSpec.scala
index a3710bf12c..5c1c3fdc12 100644
--- a/akka-core/src/test/scala/RemoteTransactionalActiveObjectSpec.scala
+++ b/akka-core/src/test/scala/RemoteTransactionalActiveObjectSpec.scala
@@ -24,13 +24,16 @@ object RemoteTransactionalActiveObjectSpec {
 
 @RunWith(classOf[JUnitRunner])
 class RemoteTransactionalActiveObjectSpec extends
-  Spec with
-  ShouldMatchers with
-  BeforeAndAfterAll {
+  Spec with 
+  ShouldMatchers with 
+  BeforeAndAfterAll {  
 
   import RemoteTransactionalActiveObjectSpec._
   Config.config
 
+  server = new RemoteServer()
+  server.start(HOSTNAME, PORT)
+
   private val conf = new ActiveObjectConfigurator
   private var messageLog = ""
 
diff --git a/akka-core/src/test/scala/TransactionalActiveObjectSpec.scala b/akka-core/src/test/scala/TransactionalActiveObjectSpec.scala
index 604e371638..93c9c1dabf 100644
--- a/akka-core/src/test/scala/TransactionalActiveObjectSpec.scala
+++ b/akka-core/src/test/scala/TransactionalActiveObjectSpec.scala
@@ -19,9 +19,15 @@ import se.scalablesolutions.akka.actor._
 /*
 @RunWith(classOf[JUnitRunner])
 class TransactionalActiveObjectSpec extends
+<<<<<<< HEAD:akka-core/src/test/scala/TransactionalActiveObjectSpec.scala
   Spec with
   ShouldMatchers with
   BeforeAndAfterAll {
+=======
+  Spec with 
+  ShouldMatchers with 
+  BeforeAndAfterAll {  
+>>>>>>> 38e8bea3fe6a7e9fcc9c5f353124144739bdc234:akka-core/src/test/scala/TransactionalActiveObjectSpec.scala
 
   private val conf = new ActiveObjectConfigurator
   private var messageLog = ""