diff --git a/TTS/tts/utils/synthesis.py b/TTS/tts/utils/synthesis.py
index 7bbc282f..979769a8 100644
--- a/TTS/tts/utils/synthesis.py
+++ b/TTS/tts/utils/synthesis.py
@@ -113,11 +113,8 @@ def synthesis(
     text,
     CONFIG,
     use_cuda,
-<<<<<<< HEAD
-=======
     ap,
     tokenizer,
->>>>>>> Refactor synthesis.py for TTSTokenizer
     speaker_id=None,
     style_wav=None,
     use_griffin_lim=False,