diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/CaseDataParent.java b/src/main/java/uk/gov/hmcts/reform/civil/model/CaseDataParent.java
index f4b74de37ed..7ac03a69033 100644
--- a/src/main/java/uk/gov/hmcts/reform/civil/model/CaseDataParent.java
+++ b/src/main/java/uk/gov/hmcts/reform/civil/model/CaseDataParent.java
@@ -438,11 +438,14 @@ public class CaseDataParent implements MappableObject {
     @JsonIgnore
     public boolean isApplicantNotRepresented() {
         return this.applicant1Represented == NO;
+<<<<<<< HEAD
     }
 
     @JsonIgnore
     public boolean isApplicantRepresented() {
         return this.applicant1Represented == YES;
+=======
+>>>>>>> CIV-11603 Fast Track Claimant Intent (#3720)
     }
 
     /**