diff --git a/runtime/engine/asr/decoder/ctc_tlg_decoder.h b/runtime/engine/asr/decoder/ctc_tlg_decoder.h
index 102e6a8bf..4540bc465 100644
--- a/runtime/engine/asr/decoder/ctc_tlg_decoder.h
+++ b/runtime/engine/asr/decoder/ctc_tlg_decoder.h
@@ -86,11 +86,7 @@ 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_;
@@ -116,14 +112,9 @@ 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_;