diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings
index 03ad41e679..ef7c1fedd9 100644
--- a/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram-iOS/en.lproj/Localizable.strings
@@ -4231,7 +4231,11 @@ Unused sets are archived when you add more.";
 
 "ChatList.ArchiveAction" = "Archive";
 "ChatList.UnarchiveAction" = "Unarchive";
+<<<<<<< HEAD
 "ChatList.HideAction" = "Unpin";
+=======
+"ChatList.HideAction" = "Hide";
+>>>>>>> e8f89f29928527555050923b6bdeaa73b78d02d0
 "ChatList.UnhideAction" = "Pin";
 
 "ChatList.UndoArchiveTitle" = "Chat archived";