resolved conflicts

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

@@ -22,5 +22,6 @@ public class CompanyResponse extends BaseBean{
     private String numberOfEmployees;
     private BigDecimal annualRevenue;
     private Boolean isLegalRepresentant;
-    
+    private String contactName;
+    private String contactEmail;
 }

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

@@ -41,6 +41,18 @@ public class LoginResponse {
     
     private LocalDateTime dateOfBirth;
 
+    private Boolean privacy;
+
+    private Boolean terms;
+
+    private Boolean marketing;
+
+    private Boolean offers;
+
+    private Boolean thirdParty;
+
+    private String emailPec;
+
     private LocalDateTime createdDate;
 
     private LocalDateTime updatedDate;

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

@@ -39,4 +39,12 @@ public class UserResponseBean extends BaseBean {
     private LocalDateTime dateOfBirth;
 
     private List<CompanyResponse> companies;
+    private Boolean privacy;
+    private Boolean terms;
+
+    private Boolean marketing;
+    private Boolean offers;
+    private Boolean thirdParty;
+
+    private String emailPec;
 }

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

@@ -2,6 +2,8 @@ package net.gepafin.tendermanagement.model.response;
 
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 public class UserSamlResponse {
 
@@ -10,4 +12,6 @@ public class UserSamlResponse {
     private String firstName;
 
     private String lastName;
+
+    private LocalDateTime dateOfBirth;
 }