Resolved merge errors

FitConnect/Models/SecurityEventToken.cs

@@ -84,13 +84,13 @@ 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;
         }
 
-        if (eventsClaim.Value.Contains(Accept)) return EventType.Accept;
+
 
         if (eventsClaim.Value.Contains(AcceptSubmissionSchema))
             return EventType.Accept;

FitConnect/Services/SelfServicePortalService.cs

+using FitConnect.Services.Interfaces;
 using Jose;
 using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Tokens;