diff --git a/requirements.txt b/requirements.txt
index 43d4124..d1a5b2b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,11 +6,7 @@ librosa==0.9.1
 llvmlite==0.39.0
 fairseq==0.12.2
 faiss-cpu==1.7.3
-<<<<<<< HEAD
-gradio==3.28.1
-=======
 gradio==3.14.0
->>>>>>> upstream/main
 Cython
 pydub>=0.25.1
 soundfile>=0.12.1