Fix merge issues

Author: Edresson

nemo/collections/speechlm2/data/duplex_ear_tts_dataset.py

@@ -288,10 +288,6 @@ def __getitem__(self, cuts: CutSet) -> dict:
             source_audio = F.pad(source_audio, (0, extra_frames))
             source_audio_lens = source_audio_lens + extra_frames
 
-<<<<<<< HEAD
-=======
-        # Add audio and text prompts       
->>>>>>> e5cc7fb09 (Fix code scanning issues)
         text_pad_id = get_pad_id(self.tokenizer)
         input_text_tokens_ = []
         source_tokens_ = []

nemo/collections/speechlm2/modules/rvq_ear_tts_vae.py

@@ -17,7 +17,7 @@
 from collections.abc import Callable
 from contextlib import contextmanager
 from dataclasses import dataclass, field
-from typing import Any, Concatenate, Literal, overload
+from typing import Any, Concatenate
 
 # Third-party
 import torch