diff --git a/requirements.txt b/requirements.txt
index 8cb2c5ef..9302f701 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -30,21 +30,7 @@ rotary_embedding_torch
 pyjyutping 
 g2pk2
 ko_pron
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 opencc; sys_platform == 'win32'
 opencc==1.1.1; sys_platform != 'win32'
 eunjeon; sys_platform == 'win32'
 python_mecab_ko; sys_platform != 'win32'
-=======
-eunjeon; sys_platform != 'windows'
-=======
-eunjeon; sys_platform == 'windows'
->>>>>>> 8d7b601 (chores)
-python_mecab_ko; sys_platform != 'windows'
->>>>>>> 1e2f91e (chores)
-=======
-eunjeon; sys_platform == 'Windows'
-python_mecab_ko; sys_platform != 'Windows'
->>>>>>> b7f969b (chores)