Merge upstream

Author: cornusandu

public/Assets/locales/en.json

@@ -765,7 +765,6 @@
     "plusPrivateServerTooltip": {
         "tooltipText": "Original Price: <b>{{originalPrice}} Robux</b><br>Currently shows as <b>Free</b> due to Roblox Plus."
     },
-<<<<<<< HEAD
     "animations": {
         "idle": "Idle",
         "walk": "Walk",
@@ -784,12 +783,11 @@
             "oldest": "Oldest"
         },
         "tooltip": "Sort by when the user joined the community"
-=======
+    },
     "status": {
         "trusted": {
             "helpText": "You are a trusted RoValra user, you can add any text, embed videos, and images.",
             "warning": "<strong>Note:</strong> If you are found to add inappropriate content against the Roblox ToS, your donator and custom badges will be revoked with no chance to get it back."
         }
->>>>>>> 2922bde (innerhtml: added verifiedInnerHtml)
     }
 }

src/content/features/profile/header/status.js

@@ -33,14 +33,11 @@ import {
     syncDonatorTier,
     getCurrentUserTier,
 } from '../../../core/settings/handlesettings.js';
-<<<<<<< HEAD
 import {
     onUserCardElement,
     observeUserCardElements,
 } from '../../../core/profile/userCardElements.js';
-=======
 import { verifiedInnerHtml, verifiedInnerHtmlSync } from '../../../core/html/innerhtml.js';
->>>>>>> 2922bde (innerhtml: added verifiedInnerHtml)
 const MAX_STATUS_LENGTH = 128;
 const REPORTING_ENABLED = false;
 let activeHomeStatusBubble = null;