diff --git a/client/components/main/layouts.css b/client/components/main/layouts.css
index 7ea06d886..d42572441 100644
--- a/client/components/main/layouts.css
+++ b/client/components/main/layouts.css
@@ -623,132 +623,6 @@ a:not(.disabled).is-active i.fa {
   }
 }
 
-<<<<<<< HEAD
-/* Tablet devices (768px - 1024px) */
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-  #content > .wrapper {
-    padding: 12px;
-  }
-
-  .wrapper {
-    padding: 12px;
-  }
-
-  .panel-default {
-    width: 90vw;
-    max-width: 90vw;
-  }
-
-  /* Touch-friendly but more compact */
-  button, .btn, .js-toggle, .js-color-choice, .js-reaction, .close {
-    min-height: 48px;
-    min-width: 48px;
-    padding: 10px 14px;
-  }
-
-  .minicard {
-    min-height: 40px;
-    padding: 10px;
-  }
-
-  .list {
-    margin: 0 12px;
-    min-width: 300px;
-  }
-
-  .board-canvas {
-    padding: 0 12px 12px 0;
-  }
-
-  #header {
-    padding: 12px 16px;
-  }
-
-  #modal .modal-content {
-    width: 80vw;
-    max-width: 600px;
-  }
-
-  #modal .modal-content-wide {
-    width: 90vw;
-    max-width: 800px;
-  }
-
-  .setting-content .content-body {
-    gap: 20px;
-  }
-
-  .setting-content .content-body .side-menu {
-    width: 250px;
-  }
-
-  /* Responsive handling for quick-access description on tablets */
-  #header-quick-access ul.header-quick-access-list li.current.empty {
-    max-width: 300px;
-  }
-}
-||||||| parent of 2e0149f79 (🚧 Remove zoom/mobile option, rework header/misc layout to be more responsive)
-/* Tablet devices (768px - 1024px) */
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-  #content > .wrapper {
-    padding: 12px;
-  }
-
-  .wrapper {
-    padding: 12px;
-  }
-
-  .panel-default {
-    width: 90vw;
-    max-width: 90vw;
-  }
-
-  /* Touch-friendly but more compact */
-  button, .btn, .js-toggle, .js-color-choice, .js-reaction, .close {
-    min-height: 48px;
-    min-width: 48px;
-    padding: 10px 14px;
-  }
-
-  .minicard {
-    min-height: 40px;
-    padding: 10px;
-  }
-
-  .list {
-    margin: 0 12px;
-    min-width: 300px;
-  }
-
-  .board-canvas {
-    padding: 0 12px 12px 0;
-  }
-
-  #header {
-    padding: 12px 16px;
-  }
-
-  #modal .modal-content {
-    width: 80vw;
-    max-width: 600px;
-  }
-
-  #modal .modal-content-wide {
-    width: 90vw;
-    max-width: 800px;
-  }
-
-  .setting-content .content-body {
-    gap: 20px;
-  }
-
-  .setting-content .content-body .side-menu {
-    width: 250px;
-  }
-}
-=======
->>>>>>> 2e0149f79 (🚧 Remove zoom/mobile option, rework header/misc layout to be more responsive)
-
 /* Large displays and digital signage (1920px+) */
 @media screen and (min-width: 1920px) {
   .board-canvas {
diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js
index ee1e01620..3934deec0 100644
--- a/client/components/sidebar/sidebar.js
+++ b/client/components/sidebar/sidebar.js
@@ -1342,7 +1342,6 @@ BlazeComponent.extendComponent({
         'keyup .js-search-member-input'(event) {
           Session.set('addMemberPopup.error', '');
           const query = event.target.value.trim();
-          this.searchQuery.set(query);
 
           // Clear previous timeout
           if (this.searchTimeout) {
diff --git a/client/lib/dialogWithBoardSwimlaneList.js b/client/lib/dialogWithBoardSwimlaneList.js
index 31c14b334..46efdc75d 100644
--- a/client/lib/dialogWithBoardSwimlaneList.js
+++ b/client/lib/dialogWithBoardSwimlaneList.js
@@ -54,10 +54,10 @@ export class DialogWithBoardSwimlaneList extends BlazeComponent {
       this.selectedListId.set(this.cardOption.listId);
     }
     this.getBoardData(this.selectedBoardId.get());
-    if (this.selectedSwimlaneId.get() || ReactiveCache.getSwimlane({_id: this.selectedSwimlaneId.get(), boardId: this.selectedBoardId.get()})) {
+    if (!this.selectedSwimlaneId.get() || !ReactiveCache.getSwimlane({_id: this.selectedSwimlaneId.get(), boardId: this.selectedBoardId.get()})) {
       this.setFirstSwimlaneId();
     }
-    if (this.selectedListId.get() || ReactiveCache.getList({_id: this.selectedListId.get(), boardId: this.selectedBoardId.get()})) {
+    if (!this.selectedListId.get() || !ReactiveCache.getList({_id: this.selectedListId.get(), boardId: this.selectedBoardId.get()})) {
       this.setFirstListId();
     }
   }