diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java
index 48ef616..019aed7 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java
@@ -343,11 +343,8 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
             List<NuBizNuCustomerServer> directivesList = new ArrayList<>();
             for(NuBizNuCustomerServer etd : directiveList){
                 if(etd.getPackageId().equals(et.getId())){
-<<<<<<< .mine
                     etd.setNetImmediateFile("https://www.focusnu.com/media/upFiles/"+etd.getImmediateFile());
-=======
                     getNetImages(etd);
->>>>>>> .theirs
                     directivesList.add(etd);
                 }
             }