diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java
index cc080ac697..7bb101eea3 100644
--- a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java
+++ b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java
@@ -1,12 +1,16 @@
 package com.alibaba.druid.hbase.hbql.ast;
 
+<<<<<<< HEAD
 import com.alibaba.druid.hbase.mapping.HMapping;
+=======
+>>>>>>> ca778ea3c3ae05528c08c708193c8a4f79392825
 import com.alibaba.druid.sql.ast.SQLStatementImpl;
 
 public class HBQLCreateMappingStatement extends SQLStatementImpl implements HBQLStatement {
 
     private static final long serialVersionUID = 1L;
 
+<<<<<<< HEAD
     private HMapping          mapping          = new HMapping();
 
     public HMapping getMapping() {
@@ -17,4 +21,6 @@ public class HBQLCreateMappingStatement extends SQLStatementImpl implements HBQL
         this.mapping = mapping;
     }
 
+=======
+>>>>>>> ca778ea3c3ae05528c08c708193c8a4f79392825
 }
diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLStatementParser.java b/src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLStatementParser.java
index 761dbfd80e..b318458c26 100644
--- a/src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLStatementParser.java
+++ b/src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLStatementParser.java
@@ -1,21 +1,6 @@
 package com.alibaba.druid.hbase.hbql.parser;
 
-import com.alibaba.druid.sql.parser.Lexer;
-import com.alibaba.druid.sql.parser.SQLExprParser;
-import com.alibaba.druid.sql.parser.SQLStatementParser;
 
+public class HBQLStatementParser {
 
-public class HBQLStatementParser extends SQLStatementParser {
-    protected SQLExprParser exprParser;
-
-    public HBQLStatementParser(String sql){
-        super(sql);
-
-        this.exprParser = new SQLExprParser(lexer);
-    }
-
-    public HBQLStatementParser(Lexer lexer){
-        super(lexer);
-        this.exprParser = new SQLExprParser(lexer);
-    }
 }