Fixed merge conflicts

Frontend/src/views/RestMockView.vue

@@ -1,16 +1,6 @@
 <script setup lang="ts">
 import RestMockMessageComponent from '@components/mock/RestMockMessageComponent.vue'
 import HistoryComponent from '@components/mock/HistoryComponent.vue'
-<<<<<<< HEAD
-
-</script>
-
-
-<template>
-    <div class="flex flex-col xl:flex-row gap-6 w-full overflow-y-scroll overflow-x-hidden h-full">
-        <RestMockMessageComponent></RestMockMessageComponent>
-        <HistoryComponent></HistoryComponent>
-=======
 import ManTooltipComponent from '@/components/man/ManTooltipComponent.vue';
 import RestMockManComponent from '@/components/man/RestMockManComponent.vue';
 import { ref } from 'vue';
@@ -34,7 +24,6 @@ function setHistoryVisibility(visibility : boolean) {
             </div>
             <RestMockManComponent></RestMockManComponent>
         </ManTooltipComponent>
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
     </div>
 </template>