clean up conflicts

src/app/features/lobby/Lobby.tsx

@@ -194,16 +194,6 @@ export function Lobby() {
 
   const getRoom = useGetRoom(allJoinedRooms);
 
-  const canEditSpaceChild = useCallback(
-    (powerLevels: IPowerLevels) =>
-      powerLevelAPI.canSendStateEvent(
-        powerLevels,
-        StateEvent.SpaceChild,
-        powerLevelAPI.getPowerLevel(powerLevels, mx.getUserId() ?? undefined)
-      ),
-    [mx]
-  );
-
   const closedCategoriesCache = useRef(new Map());
   useEffect(() => {
     closedCategoriesCache.current.clear();

src/app/features/lobby/SpaceItem.tsx

@@ -362,7 +362,6 @@ function AddSpaceButton({ item }: { item: HierarchyItem }) {
         </FocusTrap>
       }
     >
-
       {item.parentId === undefined ? (
         <Chip
           variant="SurfaceVariant"
@@ -373,9 +372,6 @@ function AddSpaceButton({ item }: { item: HierarchyItem }) {
         >
           <Text size="B300">Add Space</Text>
         </Chip>
-        {addExisting && (
-          <AddExistingModal space parentId={item.roomId} requestClose={() => setAddExisting(false)} />
-        )}
       ) : (
         <TooltipProvider
           position="Bottom"
@@ -402,6 +398,9 @@ function AddSpaceButton({ item }: { item: HierarchyItem }) {
           )}
         </TooltipProvider>
       )}
+      {addExisting && (
+        <AddExistingModal space parentId={item.roomId} requestClose={() => setAddExisting(false)} />
+      )}
     </PopOut>
   );
 }