Resolved conflicts.

src/main/java/net/gepafin/tendermanagement/service/AmazonS3Service.java

@@ -21,4 +21,5 @@ AmazonS3Service {
 
 	UploadFileOnAmazonS3Response copyFile(String fileName, String oldS3Path, String newS3Path);
 
+	String extractS3KeyFromUrl(String url);
 }

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

@@ -217,4 +217,9 @@ public class AmazonS3ServiceImpl implements AmazonS3Service {
        }
 
     }
+
+    public String extractS3KeyFromUrl(String url) {
+
+        return url.replace(s3Url, "");
+    }
 }