diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java
index 44506ae12cc454af2dd3ca898b85b507901b9870..e348835363a9bb96d381e9de8cc20da84a9507c1 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java
@@ -130,10 +130,10 @@ public class ThreadUtils {
 
     /**
      * Wrapper over ScheduledThreadPoolExecutor
-     * @param threadName
-     * @param corePoolSize
-     * @param isDaemon
-     * @return
+     * @param threadName threadName
+     * @param corePoolSize corePoolSize
+     * @param isDaemon isDaemon
+     * @return ScheduledThreadPoolExecutor
      */
     public static ScheduledExecutorService newThreadScheduledExecutor(String threadName, int corePoolSize, boolean isDaemon) {
         ThreadFactory threadFactory = new ThreadFactoryBuilder()
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java
index 3dd548df8112f84b5033e6e3cd6a7a5c48b11909..5d4f867295f3e247c4df4cbb38426995308b78cc 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java
@@ -425,10 +425,7 @@ public class HadoopUtils implements Closeable {
     }
 
     /**
-<<<<<<< HEAD
      * get data hdfs path
-=======
->>>>>>> remotes/upstream/dev
      * @return data hdfs path
      */
     public static String getHdfsDataBasePath() {
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/Preconditions.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/Preconditions.java
index ad8cf8fd69191bb2cec9d3425a0d85f3313c9448..32fd298a7dfe932374cf79be25d01da38b1373e0 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/Preconditions.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/Preconditions.java
@@ -75,7 +75,7 @@ public final class Preconditions {
      * @param errorMessageArgs The arguments for the error message, to be inserted into the
      *                         message template for the {@code %s} placeholders.
      *
-     * @param <T>
+     * @param <T> T
      * @return The object reference itself (generically typed).
      */
     public static <T> T checkNotNull(T reference,