Resolved conflicts

src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java

@@ -30,6 +30,9 @@ public class ApplicationEvaluationEntity extends BaseEntity{
 
     @Column(name = "status")
     private String status;
+    
+    @Column(name = "MOTIVATION")
+    private String motivation;
 
     @Column(name="IS_DELETED")
     private Boolean isDeleted;

src/main/java/net/gepafin/tendermanagement/entities/CommunicationEntity.java

@@ -26,6 +26,12 @@ public class CommunicationEntity extends BaseEntity {
     @Column(name = "COMMENTED_DATE")
     private LocalDateTime commentedDate;
 
+    @Column(name = "SENDER_USER_ID")
+    private Long senderUserId;
+
+    @Column(name = "RECEIVER_USER_ID")
+    private Long receiverUserId;
+
     @ManyToOne
     @JoinColumn(name = "AMENDMENT_ID", referencedColumnName = "id", nullable = false)
     private ApplicationAmendmentRequestEntity applicationAmendmentRequest;