Resovled merge errors

BasicUnitTest/SecurityEventTokenTests.cs

@@ -26,7 +26,6 @@ public class SecurityEventTokenTests {
         _encryption = new FitEncryption(container.Resolve<KeySet>(), null);
     }
 
-    private FitEncryption _encryption = null!;
 
     [Test]
     public void CreateJwt_AcceptSubmission() {
@@ -140,7 +139,7 @@ public class SecurityEventTokenTests {
         var token = _encryption.CreateSecurityEventToken(Guid.NewGuid().ToString(),
             Guid.NewGuid().ToString(),
             Guid.NewGuid().ToString(),
-     
+            rejectSubmission,
             new[] { new Problems() { Description = "A real big issue" } }
         );
         Console.WriteLine(token);

E2ETest/EndToEndTestBase.cs

@@ -9,8 +9,6 @@ using MockContainer;
 namespace E2ETest;
 
 public abstract class EndToEndTestBase {
-    protected ISender Sender = null!;
-    protected ISubscriber Subscriber = null!;
     protected ILogger Logger = null!;
     protected ISender Sender = null!;
     protected MockSettings Settings = null!;

FitConnect/FitConnect.csproj

@@ -27,8 +27,6 @@
     <ItemGroup>
         <None Remove="metadata.schema.json" />
         <EmbeddedResource Include="metadata.schema.json" />
-        <Compile Remove="Properties\AssemblyInfo.cs" />
-        <None Include="Properties\AssemblyInfo.cs" />
     </ItemGroup>
 
     <ItemGroup>

FitConnect/Models/SecurityEventToken.cs

@@ -80,7 +80,7 @@ public class SecurityEventToken {
         if (eventsClaim.Value.Contains(
                 ForwardSubmissionSchema))
             return EventType.Forward;
-        if (eventsClaim.Value.Contains(Reject)) {
+        if (eventsClaim.Value.Contains(
                 RejectSubmissionSchema)) {
             Problems = GetProblems(events?.Values?.FirstOrDefault()?.ToString() ?? "");
             return EventType.Reject;