Fixed merge conflicts

Frontend/src/components/xml/tooltips/TooltipCategoryComponent.vue

@@ -13,11 +13,7 @@ function toggleTooltips() {
 </script>
 
 <template>
-<<<<<<< HEAD
-    <div class="flex p-2 flex-col rounded-xl shadow-lg bg-gradient-to-r from-zinc-400 to-slate-400 dark:from-slate-600 dark:to-slate-700">
-=======
     <div class="flex p-2 flex-col rounded-xl shadow-lg bg-gradient-to-r from-gray-300 to-slate-300 dark:from-slate-500 dark:to-slate-600">
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
         <button :class="{ 'mb-2' : !isCategoryHidden }" class="dark:text-slate-100 hover:font-bold" @click="toggleTooltips()">{{ props.name }}</button>
         <div id="content" :class="{'hidden' : isCategoryHidden}" class="flex flex-col gap-4 w-full h-fit p-2 rounded-xl dark:text-white bg-indigo-50 dark:bg-slate-800" >
             <slot></slot>