diff --git a/inc/framework/generator/ge_generator.h b/inc/framework/generator/ge_generator.h
index be788a8a..5a69ac0d 100644
--- a/inc/framework/generator/ge_generator.h
+++ b/inc/framework/generator/ge_generator.h
@@ -82,10 +82,17 @@ class GeGenerator {
 
  private:
   Status GenerateModel(const Graph &graph, const string &file_name_prefix, const vector<GeTensor> &inputs,
+<<<<<<< HEAD
                        ge::ModelBufferData& model, bool is_offline = true);
   Status BuildSingleOp(OpDescPtr &op_desc, const vector<GeTensor> &inputs, const vector<GeTensor> &outputs,
                        const string &model_file_name, OpEngineType engine_type,
                        ModelBufferData &model_buff, bool is_offline = true);
+=======
+                       ge::ModelBufferData &model, bool is_offline = true);
+  Status BuildSingleOp(OpDescPtr &op_desc, const vector<GeTensor> &inputs, const vector<GeTensor> &outputs,
+                       const string &model_file_name, OpEngineType engine_type, ModelBufferData &model_buff,
+                       bool is_offline = true);
+>>>>>>> Feature:single op support optional input
   Status CheckForSingleOp(OpDescPtr &op_desc, const vector<GeTensor> &inputs, const vector<GeTensor> &outputs);
 
   class Impl;