diff --git a/gbus/saga/instance.go b/gbus/saga/instance.go
index 9e5cad1..157b93a 100644
--- a/gbus/saga/instance.go
+++ b/gbus/saga/instance.go
@@ -63,6 +63,7 @@ func (si *Instance) invoke(exchange, routingKey string, invocation *sagaInvocati
 		}).Info("invoking method on saga")
 
 		span, sctx := opentracing.StartSpanFromContext(invocation.Ctx(), methodName)
+
 		// replace the original context with the conext built around the span so we ca
 		// trace the saga handler that is invoked
 		invocation.ctx = sctx
diff --git a/tests/testMessages.go b/tests/testMessages.go
index ea0f585..87df635 100644
--- a/tests/testMessages.go
+++ b/tests/testMessages.go
@@ -9,6 +9,10 @@ var _ gbus.Message = &Reply2{}
 var _ gbus.Message = &Event1{}
 var _ gbus.Message = &Event2{}
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> golint fixes into master (#154)
 //PoisonMessage is a malformed message to test poison pill scenarios
 type PoisonMessage struct {
 }