resolved conflicts

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

@@ -13,6 +13,14 @@ public class ApplicationResponse{
 
     private Long callId;
 
+    private String callTitle;
+
+    private LocalDateTime callEndDate;
+
+    private LocalDateTime modifiedDate;
+
+    private Integer progress;
+
     private LocalDateTime submissionDate;
 
     private String status;

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

@@ -9,6 +9,8 @@ public class FormResponseBean {
 
     private Long id;
 
+    private String callStatus;
+
     private String label;
 
     private Long callId;