Fix merge errors

Author: backspace

Diff for: packages/host/tests/acceptance/interact-submode-test.gts

@@ -54,10 +54,6 @@ module('Acceptance | interact submode tests', function (hooks) {
   setupLocalIndexing(hooks);
   setupServerSentEvents(hooks);
   setupOnSave(hooks);
-  let mockMatrixUtils = setupMockMatrix(hooks, {
-    loggedInAs: '@testuser:staging',
-    activeRealms: [testRealmURL, testRealm2URL, testRealm3URL],
-  });
 
   let { setRealmPermissions, setActiveRealms, createAndJoinRoom } =
     setupMockMatrix(hooks, {

Diff for: packages/host/tests/integration/components/ai-assistant-panel-test.gts

@@ -1184,7 +1184,7 @@ module('Integration | ai-assistant-panel', function (hooks) {
         },
       );
 
-      createAndJoinRoom({ sender: '@testuser:staging', name: 'test room 0' });
+      createAndJoinRoom({ sender: '@testuser:localhost', name: 'test room 0' });
       let room1Id = createAndJoinRoom({
         sender: '@testuser:localhost',
         name: 'test room 1',