diff --git a/docs/changelog.md b/docs/changelog.md
index f0057d0edea..20bc44f55b2 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1900,7 +1900,7 @@ Bugfixes and other improvements for your Zulip experience.
 ### Highlights for users (since 26.1.124 / 26.2.125)
 
 * Highlight colors for code blocks now match the webapp and
-  offer more contrast, especially in Dark theme.
+  offer more contrast, especially in night mode.
 
 Plus, like every release, many other improvements for your Zulip
 experience.
@@ -1919,7 +1919,7 @@ experience.
 ### Highlights for users (since 26.1.124 / 26.2.125)
 
 * Highlight colors for code blocks now match the webapp and
-  offer more contrast, especially in Dark theme.
+  offer more contrast, especially in night mode.
 
 Plus, like every release, many other improvements for your Zulip
 experience.
diff --git a/static/translations/messages_tl.json b/static/translations/messages_tl.json
index 8c441111abd..e7b690b225b 100644
--- a/static/translations/messages_tl.json
+++ b/static/translations/messages_tl.json
@@ -156,13 +156,8 @@
   "{realm} is running Zulip Server {serverVersion}, which is unsupported. Please contact your administrator about upgrading.": "{realm} is running Zulip Server {serverVersion}, which is unsupported. Please contact your administrator about upgrading.",
   "Learn more": "Learn more",
   "Full profile": "Full profile",
-<<<<<<< HEAD
-  "Settings": "Settings",
-  "Night mode": "Night mode",
-=======
   "Settings": "Mga Itinakda",
   "Night mode": "Night mode",
->>>>>>> c8af6d69ecbed660643facc1e84b416e3dbff879
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Wika",
   "Arabic": "Arabic",