diff --git a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
index b3a28f18f..50bda8346 100644
--- a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
@@ -554,7 +554,7 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 			ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
 			logger.info("http配置下发响应信息："+result.getMsg());
 
-		}else if(isAudit==3 && entity.getIsValid() == 1) {
+		}else if(isAudit==3) {
 			maatCfg.setCompileId(entity.getCompileId());
 			maatCfg.setServiceId(entity.getServiceId());
 			maatCfg.setIsValid(0);//无效
diff --git a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
index 927d3f76a..514182d35 100644
--- a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
@@ -410,7 +410,7 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
 					logger.error("欺骗IP池配置配置下发失败",e);
 					throw e;
 				}
-			}else if(entity.getIsAudit()==3 && entity.getIsValid() == 1) {
+			}else if(entity.getIsAudit()==3) {
 				PxyObjSpoofingIpPool cfg = new PxyObjSpoofingIpPool();
 				cfg.setIsValid(0);
 				cfg.setCompileId(pool.getCompileId());
@@ -592,7 +592,7 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
 			ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
 			logger.info("intercept IP/DNS 配置下发响应信息："+result.getMsg());
 
-		}else if(isAudit==3 && entity.getIsValid() == 1) {
+		}else if(isAudit==3) {
 			maatCfg.setCompileId(entity.getCompileId());
 			maatCfg.setServiceId(entity.getServiceId());
 			maatCfg.setIsValid(0);//无效
diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
index 68cf773d4..cfd77810c 100644
--- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
@@ -741,7 +741,7 @@ public class IpCfgService extends CrudService<IpCfgDao, BaseIpCfg> {
 				throw new RuntimeException(
 						"<spring:message code=\"request_service_failed\"/>:" + props.getProperty("unknown_cfg_type"));
 			}
-		} else if (isAudit == 3 && entity.getIsValid() == 1) {
+		} else if (isAudit == 3) {
 			if (maatType == Constants.CALLBACK_TYPE) {
 				List<InlineIp> ipList = new ArrayList<>();
 				for (IpPortCfg cfg : entity.getIpPortList()) {
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index b695181bd..5cac7cdbe 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1515,7 +1515,6 @@ src_ip_pattern=Client IP Pattern
 dest_ip_pattern=Server IP Pattern
 src_port_pattern=Client Port Pattern
 dest_port_pattern=Server Port Pattern
-<<<<<<< develop_20190508_branch
 url_group_configuration=URL Group Configuration
 dns_keyword_group_configuration=DNS Keyword Group Configuration
 app_ip_correlation=APP IP Correlation