Resolved conflicts

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

@@ -278,6 +278,9 @@ public class CompanyDocumentDao {
         }
 
 
+        URL amazonS3Url = amazonS3.getUrl(bucketName, newS3Path);
+        String fileUrl = amazonS3Url.toString();
+
         DocumentEntity entity = new DocumentEntity();
         entity.setFilePath(response.getFilePath());
         entity.setFileName(response.getFileName());