Resolved conflicts

src/main/java/net/gepafin/tendermanagement/model/response/AmendmentFormFieldResponse.java

@@ -1,8 +1,10 @@
 package net.gepafin.tendermanagement.model.response;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class AmendmentFormFieldResponse {
     private String fieldId;
     private String label;

src/main/java/net/gepafin/tendermanagement/model/response/ApplicationAmendmentRequestResponse.java

@@ -14,8 +14,8 @@ public class ApplicationAmendmentRequestResponse {
     private String note;
     private Long responseDays;
     private LocalDateTime startDate;
-    private boolean isSendNotification;
-    private boolean isSendEmail;
+    private Boolean isSendNotification;
+    private Boolean isSendEmail;
     private Long protocolNumber;
     private String callName;
     private String beneficiaryName;

src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java

@@ -54,4 +54,5 @@ public class CallDetailsResponseBean {
 
     private LocalDateTime updatedDate;
 
+    private Long preferredCallId;
 }

src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java

@@ -73,6 +73,7 @@ public class CallResponse {
     
     private String currentStep;
 
+    private Long preferredCallId;
 }