diff --git a/requirements.txt b/requirements.txt
index c69bb75c..586fc960 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,7 +31,12 @@ rotary_embedding_torch
 pyjyutping 
 g2pk2
 ko_pron
+<<<<<<< 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'
+python_mecab_ko; sys_platform != 'windows'
+>>>>>>> 1e2f91e (chores)