diff --git a/paddle/function/BufferArg.h b/paddle/function/BufferArg.h
index f7df56846f6d7b3e2581086f26fcdadf5cdef07a..0dc7792f646457c22ee4791f18814afaa3809f7b 100644
--- a/paddle/function/BufferArg.h
+++ b/paddle/function/BufferArg.h
@@ -190,7 +190,7 @@ public:
       : BufferArg(VALUE_TYPE_INT32, shape, argType) {
     bufferType_ = TENSOR_SEQUENCE_ID;
     CHECK_EQ(shape_.ndims(), 1UL);
-    CHECK_GT(shape_[0], 1UL);
+    CHECK_GE(shape_[0], 1UL);
     numSeqs_ = shape_[0] - 1;
   }
 
diff --git a/paddle/function/FunctionTest.h b/paddle/function/FunctionTest.h
index 076aace14cc56657148df90838d48fd82968cb76..0cfafdb27f55a3e6617d31a968d2a05fc77f5b46 100644
--- a/paddle/function/FunctionTest.h
+++ b/paddle/function/FunctionTest.h
@@ -134,7 +134,6 @@ public:
                                     output.valueType(),
                                     output.shape(),
                                     argType));
-<<<<<<< HEAD
   }
 
   /// add and init output sparse matrix