diff --git a/src/parser/AdminSentences.h b/src/parser/AdminSentences.h
index 3a2536117..5c249bc2d 100644
--- a/src/parser/AdminSentences.h
+++ b/src/parser/AdminSentences.h
@@ -336,14 +336,6 @@ class CreateSpaceSentence final : public CreateSentence {
         groupName_.reset(name);
     }
 
-    const std::string* groupName() const {
-        return groupName_.get();
-    }
-
-    const SpaceOptList* spaceOpts() const {
-        return spaceOpts_.get();
-    }
-
     void setComment(std::string *name) {
         comment_.reset(name);
     }
diff --git a/src/validator/AdminValidator.cpp b/src/validator/AdminValidator.cpp
index 0de19d6ee..ee4b77d38 100644
--- a/src/validator/AdminValidator.cpp
+++ b/src/validator/AdminValidator.cpp
@@ -106,7 +106,6 @@ Status CreateSpaceValidator::validateImpl() {
             }
         }
     }
-<<<<<<< HEAD
     // check comment
     if (sentence->comment() != nullptr) {
         spaceDesc_.set_comment(*sentence->comment());
@@ -116,8 +115,6 @@ Status CreateSpaceValidator::validateImpl() {
         return Status::SemanticError("Group default conflict");
     }
 
-=======
->>>>>>> fix create space on group
     // if charset and collate are not specified, set default value
     if (!(*spaceDesc_.charset_name_ref()).empty() && !(*spaceDesc_.collate_name_ref()).empty()) {
         NG_RETURN_IF_ERROR(charsetInfo->charsetAndCollateMatch(*spaceDesc_.charset_name_ref(),