diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
index d9b426d5c..05aae6684 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
@@ -5,13 +5,10 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.nl.acs.ext.wms.data.*;
 import org.nl.acs.ext.wms.data.one.*;
-<<<<<<< Updated upstream
 import org.nl.acs.ext.wms.data.one.ApplyLabelingAndBindingRequest;
 import org.nl.acs.ext.wms.data.one.ApplyLabelingAndBindingResponse;
 import org.nl.acs.ext.wms.data.one.BaseRequest;
-=======
 import org.nl.acs.instruction.domain.Instruction;
->>>>>>> Stashed changes
 
 public interface AcsToWmsService {
 
@@ -133,7 +130,6 @@ public interface AcsToWmsService {
      */
     BlankingButtonResponse applyBlankButtonTask(BlankingButtonRequest param);
 
-<<<<<<< Updated upstream
     /**
      * 向lms申请反馈
      * @param param
@@ -147,7 +143,7 @@ public interface AcsToWmsService {
      * @return
      */
     ApplyPlugPullSitResponse applyPlugPullSiteRequest(ApplyPlugPullSiteRequest param);
-=======
+
 
     /**
      * 查询站点有无货状态
@@ -156,5 +152,4 @@ public interface AcsToWmsService {
      */
     JSONObject queryStationState(Instruction inst);
 
->>>>>>> Stashed changes
 }