Resolved conflicts

src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java

@@ -170,5 +170,10 @@ public class ApplicationServiceImpl implements ApplicationService {
 
         return csvBytes;
     }
-
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ApplicationResponse readmitApplication(HttpServletRequest request, Long applicationId) {
+        UserEntity userEntity = validator.validateUser(request);
+        return applicationDao.readmitApplication(request, applicationId);
+    }
 }