diff --git a/node_modules/nodebb-theme-harmony/templates/category.tpl b/node_modules/nodebb-theme-harmony/templates/category.tpl
index e9b75915ce..b03239d9cb 100644
--- a/node_modules/nodebb-theme-harmony/templates/category.tpl
+++ b/node_modules/nodebb-theme-harmony/templates/category.tpl
@@ -39,6 +39,17 @@
 		<!-- IMPORT partials/category/subcategory.tpl -->
 		{{{ if (topics.length || privileges.topics:create) }}}
 		<!-- IMPORT partials/topic-list-bar.tpl -->
+
+		<!-- Add search field and button -->
+		<div class="d-flex justify-content-center my-3">
+			<div class="input-group" style="max-width: 400px;"> 
+				<input type="text" class="form-control form-control-sm" placeholder="Search topics..." aria-label="Search topics">
+				<button class="btn btn-primary" type="button"> 
+					<i class="fa fa-search"></i>
+				</button>
+			</div>
+		</div>
+    
 		{{{ end }}}
 
 		{{{ if (!topics.length && privileges.topics:create) }}}
diff --git a/node_modules/nodebb-theme-harmony/templates/partials/sidebar-left.tpl b/node_modules/nodebb-theme-harmony/templates/partials/sidebar-left.tpl
index 0681be74c2..59f128c7cf 100644
--- a/node_modules/nodebb-theme-harmony/templates/partials/sidebar-left.tpl
+++ b/node_modules/nodebb-theme-harmony/templates/partials/sidebar-left.tpl
@@ -31,11 +31,11 @@
 
 
 <!-- A button to open the popup form (alternative button outside sidebar) -->
-<<<<<<< HEAD
+
 <button class="btn buttonSidebar" onclick="openForm()">Submit bug/feedback</button>
-=======
+
 <button class="buttonSidebar" onclick="openForm()">Submit bug/feedback</button>
->>>>>>> 5ab02d03a720bd71832150ed6812c782094f44f0
+
 
 <!-- The Form Modal -->
 <div class="form-popup" id="bug-feedback-modal" style="display:none;">
@@ -49,11 +49,10 @@
     <textarea placeholder="Enter Description" name="description" class="form-control" required></textarea>
 
     <button type="submit" class="btn btn-primary">Submit</button>
-<<<<<<< HEAD
+
     <button type="button" class="btn btn-danger cancel " onclick="closeForm()">Close</button>
-=======
+
     <button type="button" class="btn btn-danger cancel buttonSidebar" onclick="closeForm()">Close</button>
->>>>>>> 5ab02d03a720bd71832150ed6812c782094f44f0
   </form>
 </div>
 
@@ -62,13 +61,11 @@
   .form-popup {
     display: none;
     position: fixed;
-<<<<<<< HEAD
     top: 50%;
     left: 15%;
-=======
+
     bottom: 0;
     right: 15px;
->>>>>>> 5ab02d03a720bd71832150ed6812c782094f44f0
     border: 3px solid #f1f1f1;
     z-index: 9;
   }
@@ -76,20 +73,15 @@
   .form-container {
     max-width: 300px;
     padding: 10px;
-<<<<<<< HEAD
     background-color: WhiteSmoke;
-=======
     background-color: white;
->>>>>>> 5ab02d03a720bd71832150ed6812c782094f44f0
   }
 
   .form-container .btn {
     background-color: #04AA6D;
-<<<<<<< HEAD
     color: white ;
-=======
+
     color: white;
->>>>>>> 5ab02d03a720bd71832150ed6812c782094f44f0
     padding: 16px 20px;
     border: none;
     cursor: pointer;
@@ -102,7 +94,6 @@
     background-color: red;
   }
 
-<<<<<<< HEAD
   .buttonSidebar {
     background-color: CornflowerBlue; 
     color: back; 
@@ -121,11 +112,10 @@
 }
 
  
-=======
+
   .form-container .btn:hover, .open-button:hover {
     opacity: 1;
   }
->>>>>>> 5ab02d03a720bd71832150ed6812c782094f44f0
 </style>
 
 
@@ -133,7 +123,6 @@
 <!-- JavaScript for Form Opening and Closing -->
 <script>
 
-<<<<<<< HEAD
 
 
 document.querySelector(".form-popup").onsubmit = function(event) {
@@ -141,9 +130,8 @@ document.querySelector(".form-popup").onsubmit = function(event) {
   alert('Thank you! We received your feedback and will get back to you soon.');
   console.log("Sumbmitted the form :p yay !")
 };
-=======
+
 buttonSidebar.addEventListener("click", openForm()) 
->>>>>>> 5ab02d03a720bd71832150ed6812c782094f44f0
 
 function openForm() {
   console.log("Button Clicked ......")
@@ -157,11 +145,7 @@ function closeForm() {
 </script>
 
 
-<<<<<<< HEAD
-=======
-  
 
->>>>>>> 5ab02d03a720bd71832150ed6812c782094f44f0
 		<div class="sidebar-toggle m-2 d-none d-lg-block">
 			<a href="#" role="button" component="sidebar/toggle" class="nav-link d-flex gap-2 align-items-center p-2 pointer w-100 text-nowrap" title="[[themes/harmony:expand]]" aria-label="[[themes/harmony:sidebar-toggle]]">
 				<i class="fa fa-fw fa-angles-right"></i>
@@ -170,6 +154,9 @@ function closeForm() {
 			</a>
 		</div>
 	</div>
+
+</nav>
+
 </nav>