Merge fix

README.md

@@ -85,7 +85,6 @@ Setting up your Hometown development environment is [exactly like setting up you
 You can open issues for bugs you've found or features you think are missing. You can also submit pull requests to this repository or submit translations using Crowdin. To get started, take a look at [CONTRIBUTING.md](CONTRIBUTING.md). If your contributions are accepted into Mastodon, you can request to be paid through [our OpenCollective](https://opencollective.com/mastodon).
 
 **IRC channel**: #mastodon on irc.libera.chat
->>>>>>> v3.5.0
 
 ## License
 

app/javascript/mastodon/locales/ms.json

@@ -489,7 +489,6 @@
   "status.show_more": "Tunjukkan lebih",
   "status.show_more_all": "Tunjukkan lebih untuk semua",
   "status.show_thread": "Tunjuk bebenang",
->>>>>>> v3.5.0
   "status.uncached_media_warning": "Tidak tersedia",
   "status.unmute_conversation": "Nyahbisukan perbualan",
   "status.unpin": "Nyahsemat daripada profil",

app/javascript/styles/mastodon/components.scss

@@ -7814,7 +7814,6 @@ div.status__content--with-spoiler {
       &--hidden {
         display: none;
       }
->>>>>>> v3.5.0
     }
   }
 }