Resolved conflict of PR Updated Application Rejection Flow

src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java

@@ -604,6 +604,8 @@ public class ApplicationAmendmentRequestDao {
             String body = emailContent.getBody();
             response.setEmailTemplate(body);
         }
+        response.setAmendmentType(entity.getType());
+        response.setAmendmentDocumentType(entity.getAmendmentDocumentType());
         return response;
     }