diff --git a/client/coral-framework/services/i18n.js b/client/coral-framework/services/i18n.js
index 57b487251..3b1fec2af 100644
--- a/client/coral-framework/services/i18n.js
+++ b/client/coral-framework/services/i18n.js
@@ -52,11 +52,9 @@ function init() {
   ta.register('da', daTA);
   ta.register('fr', frTA);
   ta.register('pt_BR', pt_BRTA);
-<<<<<<< HEAD
   ta.register('zh_CN', zh_CNTA);
-=======
   ta.register('zh_TW', zh_TWTA);
->>>>>>> 1125351cd1e39fefd7160930896c4f7118a611c6
+
   timeagoInstance = ta();
 }
 
diff --git a/plugins/talk-plugin-love/client/translations.yml b/plugins/talk-plugin-love/client/translations.yml
index 2d4a59485..6a2d59ebd 100644
--- a/plugins/talk-plugin-love/client/translations.yml
+++ b/plugins/talk-plugin-love/client/translations.yml
@@ -10,7 +10,7 @@ zh_CN:
   talk-plugin-love:
     love: "爱"
     loved: "已爱"
-en:
+zh_TW:
   talk-plugin-love:
     love: 喜歡
     loved: 已喜歡