Resolved conflicts

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

@@ -28,6 +28,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;