fixed merge conflict

Author: aritroCoder

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",
   "Dark theme": "Dark theme",
-=======
-  "Settings": "Mga Itinakda",
-  "Night mode": "Night mode",
->>>>>>> c8af6d69ecbed660643facc1e84b416e3dbff879
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Wika",
   "Arabic": "Arabic",