diff --git a/akka-spring/src/test/scala/UntypedActorSpringFeatureTest.scala b/akka-spring/src/test/scala/UntypedActorSpringFeatureTest.scala
index 67ab6398a6..0397d30bf0 100644
--- a/akka-spring/src/test/scala/UntypedActorSpringFeatureTest.scala
+++ b/akka-spring/src/test/scala/UntypedActorSpringFeatureTest.scala
@@ -59,7 +59,6 @@ class UntypedActorSpringFeatureTest extends FeatureSpec with ShouldMatchers with
 
   feature("parse Spring application context") {
 
-<<<<<<< HEAD
     scenario("get a untyped actor") {
       val myactor = getPingActorFromContext("/untyped-actor-config.xml", "simple-untyped-actor")
       myactor.sendOneWay("Hello")