diff --git a/runtime/engine/asr/decoder/ctc_tlg_decoder.h b/runtime/engine/asr/decoder/ctc_tlg_decoder.h
index 58de0b05b..102e6a8bf 100644
--- a/runtime/engine/asr/decoder/ctc_tlg_decoder.h
+++ b/runtime/engine/asr/decoder/ctc_tlg_decoder.h
@@ -86,7 +86,11 @@ class TLGDecoder : public DecoderBase {
         return hypotheses_;
     }
     const std::vector<std::vector<int>>& Outputs() const override {
+<<<<<<< HEAD:runtime/engine/asr/decoder/ctc_tlg_decoder.h
         return olabels_;
+=======
+        return olabels;
+>>>>>>> 21183d48b63009e49729da6e6864ad666c09ae4b:speechx/speechx/asr/decoder/ctc_tlg_decoder.h
     }  // outputs_; }
     const std::vector<float>& Likelihood() const override {
         return likelihood_;
@@ -112,9 +116,14 @@ class TLGDecoder : public DecoderBase {
   private:
     void AdvanceDecoding(kaldi::DecodableInterface* decodable);
 
+<<<<<<< HEAD:runtime/engine/asr/decoder/ctc_tlg_decoder.h
     int num_frame_decoded_;
     std::vector<std::vector<int>> hypotheses_;
     std::vector<std::vector<int>> olabels_;
+=======
+    std::vector<std::vector<int>> hypotheses_;
+    std::vector<std::vector<int>> olabels;
+>>>>>>> 21183d48b63009e49729da6e6864ad666c09ae4b:speechx/speechx/asr/decoder/ctc_tlg_decoder.h
     std::vector<float> likelihood_;
     std::vector<std::vector<int>> times_;
 
@@ -125,4 +134,4 @@ class TLGDecoder : public DecoderBase {
 };
 
 
-}  // namespace ppspeech
\ No newline at end of file
+}  // namespace ppspeech
diff --git a/runtime/engine/asr/recognizer/u2_recognizer.cc b/runtime/engine/asr/recognizer/u2_recognizer.cc
index cb1d816e0..c4875bbcc 100644
--- a/runtime/engine/asr/recognizer/u2_recognizer.cc
+++ b/runtime/engine/asr/recognizer/u2_recognizer.cc
@@ -268,4 +268,4 @@ void U2Recognizer::SetInputFinished() {
 }
 
 
-}  // namespace ppspeech
\ No newline at end of file
+}  // namespace ppspeech
diff --git a/runtime/engine/asr/recognizer/u2_recognizer.h b/runtime/engine/asr/recognizer/u2_recognizer.h
index ef662aa9d..299b64edd 100644
--- a/runtime/engine/asr/recognizer/u2_recognizer.h
+++ b/runtime/engine/asr/recognizer/u2_recognizer.h
@@ -177,4 +177,4 @@ class U2Recognizer {
     std::thread thread_;
 };
 
-}  // namespace ppspeech
\ No newline at end of file
+}  // namespace ppspeech