diff --git a/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java b/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
index 4b5fdccee..857cb3437 100644
--- a/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
+++ b/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
@@ -15,8 +15,12 @@
  */
 package com.alibaba.nacos.config.server.controller;
 
+<<<<<<< HEAD
 import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacos.common.model.RestResult;
+=======
+import com.alibaba.nacos.config.server.utils.ParamUtils;
+>>>>>>> [#2738]Put ParamUtils into origin place for tenant legality verification.
 import com.alibaba.nacos.config.server.auth.ConfigResourceParser;
 import com.alibaba.nacos.config.server.constant.Constants;
 import com.alibaba.nacos.config.server.controller.parameters.SameNamespaceCloneConfigBean;
diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/ParamUtils.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/ParamUtils.java
index 4afabd798..e6ff3eabb 100644
--- a/config/src/main/java/com/alibaba/nacos/config/server/utils/ParamUtils.java
+++ b/config/src/main/java/com/alibaba/nacos/config/server/utils/ParamUtils.java
@@ -71,7 +71,11 @@ public class ParamUtils {
         } else if (StringUtils.isBlank(datumId) || !isValid(datumId)) {
             throw new NacosException(NacosException.INVALID_PARAM, "invalid datumId : " + datumId);
         } else if (StringUtils.isBlank(content)) {
+<<<<<<< HEAD:config/src/main/java/com/alibaba/nacos/config/server/utils/ParamUtils.java
             throw new NacosException(NacosException.INVALID_PARAM, "content is blank : " + content);
+=======
+            throw new NacosException(NacosException.INVALID_PARAM, "content is blank");
+>>>>>>> [#2738]Put ParamUtils into origin place for tenant legality verification.:config/src/main/java/com/alibaba/nacos/config/server/utils/ParamUtils.java
         } else if (content.length() > PropertyUtil.getMaxContent()) {
             throw new NacosException(NacosException.INVALID_PARAM,
                 "invalid content, over " + PropertyUtil.getMaxContent());