diff --git a/src/Http/Wolverine.Http/HttpGraph.ParameterMatching.cs b/src/Http/Wolverine.Http/HttpGraph.ParameterMatching.cs
index c2c634f42..ea5c6b251 100644
--- a/src/Http/Wolverine.Http/HttpGraph.ParameterMatching.cs
+++ b/src/Http/Wolverine.Http/HttpGraph.ParameterMatching.cs
@@ -7,10 +7,7 @@ public partial class HttpGraph
 {
     private readonly List<IParameterStrategy> _strategies = new()
     {
-<<<<<<< HEAD
-=======
         new FromFileStrategy(),
->>>>>>> alistair-file_upload_support
         new HttpChainParameterAttributeStrategy(),
         new FromServicesParameterStrategy(),
         new MessageBusStrategy(),
diff --git a/src/Persistence/Wolverine.Marten/PublishIncomingEventsBeforeCommit.cs b/src/Persistence/Wolverine.Marten/PublishIncomingEventsBeforeCommit.cs
index 5fcb6189a..45e0ae413 100644
--- a/src/Persistence/Wolverine.Marten/PublishIncomingEventsBeforeCommit.cs
+++ b/src/Persistence/Wolverine.Marten/PublishIncomingEventsBeforeCommit.cs
@@ -24,7 +24,3 @@ public override async Task BeforeSaveChangesAsync(IDocumentSession session, Canc
     }
 }
 
-internal interface IMartenEventPublisher
-{
-    ValueTask PublishAsync(IEnumerable<IEvent> events, IMessageBus bus);
-}
\ No newline at end of file