diff --git a/src/App.vue b/src/App.vue
index afc4c9b..9b042da 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -34,7 +34,7 @@
                 </li>
                 <li class="navbar-item">
                     <!-- <a class="navbar-link is-arrowless" href="#">SEARCH</a> -->
-                    <router-link class="navbar-link is-arrowless" to="/search">OPENSEARCH</router-link>
+                    <router-link class="navbar-link is-arrowless" to="/search">SEARCH</router-link>
                 </li>
                 <li class="navbar-item">
                     <!-- <a class="navbar-link is-arrowless" href="#">SERVICES</a> -->
diff --git a/src/views/search-view/search-view-component.ts b/src/views/search-view/search-view-component.ts
index e092e4e..55db805 100644
--- a/src/views/search-view/search-view-component.ts
+++ b/src/views/search-view/search-view-component.ts
@@ -61,24 +61,15 @@ export default class SearchViewComponent extends Vue {
 
     // Define settings for the OpenSearch API (core and host information)
     private open: OpenSettings = {
-<<<<<<< HEAD
         core: OPEN_CORE,
         host: OPEN_HOST, //"https://catalog.geosphere.at",
-=======
-        core: OPEN_CORE, //
-        host: OPEN_HOST, //
->>>>>>> 6f1b9f4c5f6ed9600c40865df6ea6e3b365ad129
     };
 
     private error = "";
 
     // Computed property to get search term as string
-<<<<<<< HEAD
-    get stringSearchTerm(): string {        
-=======
     get stringSearchTerm(): string {
         // If searchTerm is a string, return it directly
->>>>>>> 6f1b9f4c5f6ed9600c40865df6ea6e3b365ad129
         if (typeof this.searchTerm === "string") {
             return this.searchTerm;
         // If searchTerm is a Suggestion, return its value and type alias
@@ -129,11 +120,6 @@ export default class SearchViewComponent extends Vue {
 
     // Lifecycle hook: executed before the component is mounted
     beforeMount(): void {
-<<<<<<< HEAD
-=======
-        // console.log("beforeMount!");
-        
->>>>>>> 6f1b9f4c5f6ed9600c40865df6ea6e3b365ad129
         // Trigger search based on provided display and type props
         if (this.display != "" && this.type != undefined) {
             const enumKey: "Title" | "Author" | "Subject" | "Doctype" | null = this.getEnumKeyByEnumValue(SearchType, this.type);