diff --git a/source/Calamari/ArgoCD/ArgoCDModule.cs b/source/Calamari/ArgoCD/ArgoCDModule.cs
index 680fd320ce..6a75725dc4 100644
--- a/source/Calamari/ArgoCD/ArgoCDModule.cs
+++ b/source/Calamari/ArgoCD/ArgoCDModule.cs
@@ -1,11 +1,17 @@
 using Autofac;
 using Calamari.ArgoCD.Conventions;
 using Calamari.ArgoCD.Git;
+<<<<<<< HEAD
 using Calamari.ArgoCD.Git.PullRequests;
 using Calamari.ArgoCD.Git.PullRequests.Vendors.GitLab;
 using LibGit2Sharp;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Options;
+=======
+using Calamari.ArgoCD.Git.GitVendorApiAdapters;
+using Calamari.ArgoCD.GitHub;
+using LibGit2Sharp;
+>>>>>>> release/2026.1
 
 namespace Calamari.ArgoCD
 {
@@ -63,6 +69,10 @@ void RegisterMemoryCache(ContainerBuilder builder)
                    .InstancePerLifetimeScope();
             builder.RegisterType<MemoryCache>().As<IMemoryCache>().InstancePerLifetimeScope();
         }
+        }
     }
+<<<<<<< HEAD
 }
 
+=======
+>>>>>>> release/2026.1