diff --git a/client/src/components/modules/ModuleNavigation.vue b/client/src/components/modules/ModuleNavigation.vue
index 250edb26..17aa26a3 100644
--- a/client/src/components/modules/ModuleNavigation.vue
+++ b/client/src/components/modules/ModuleNavigation.vue
@@ -7,6 +7,7 @@
       type="topic"
       v-if="module.topic"
     />
+<<<<<<< HEAD
     <div class="module-navigation__module-content" v-if="false">
       <!-- Do not display this for now, might be used later again though -->
       <router-link :to="moduleContentLink" tag="h3" class="module-navigation__heading">
@@ -27,6 +28,50 @@
         <a href="#" class="module-navigation__anchor" v-scroll-to="'#objectives-confirm'">Lernzielkontrolle</a>
       </div>
     </div>
+||||||| parent of c96f9b5b (Remove obsolete tag attributes)
+    <div
+      class="module-navigation__module-content"
+      v-if="false"
+    >
+      <!-- Do not display this for now, might be used later again though -->
+      <router-link
+        :to="moduleContentLink"
+        tag="h3"
+        class="module-navigation__heading"
+      >
+        Inhalte: {{ module.metaTitle }}
+      </router-link>
+      <div
+        class="module-navigation__anchors"
+        v-if="onModulePage"
+      >
+        <a
+          href="#"
+          class="module-navigation__anchor"
+          v-scroll-to="'#meta-title'"
+        >Einleitung</a>
+        <a
+          href="#"
+          class="module-navigation__anchor"
+          v-scroll-to="'#objectives'"
+        >Lernziele</a>
+
+        <a
+          href="#"
+          class="module-navigation__anchor"
+          v-for="(chapter, index) in module.chapters"
+          :key="chapter.id"
+          v-scroll-to="chapterId(index)"
+        >{{ chapter.title }}</a>
+        <a
+          href="#"
+          class="module-navigation__anchor"
+          v-scroll-to="'#objectives-confirm'"
+        >Lernzielkontrolle</a>
+      </div>
+    </div>
+=======
+>>>>>>> c96f9b5b (Remove obsolete tag attributes)
 
     <div
       class="module-navigation__toggle-menu"
diff --git a/client/src/components/modules/ModuleTeaser.vue b/client/src/components/modules/ModuleTeaser.vue
index d4cccb45..9afb74b4 100644
--- a/client/src/components/modules/ModuleTeaser.vue
+++ b/client/src/components/modules/ModuleTeaser.vue
@@ -2,7 +2,6 @@
   <router-link
     :to="moduleLink"
     :class="['module-teaser', {'module-teaser--small': !teaser}]"
-    tag="div"
   >
     <div
       :style="{backgroundImage: 'url('+heroImage+')'}"
@@ -44,8 +43,7 @@
 </script>
 
 <style scoped lang="scss">
-  @import "@/styles/_variables.scss";
-  @import "@/styles/_mixins.scss";
+  @import "~styles/helpers";
 
   .module-teaser {
     box-shadow: 0 3px 9px 0 rgba(0, 0, 0, 0.12);
diff --git a/client/src/components/portfolio/ProjectForm.vue b/client/src/components/portfolio/ProjectForm.vue
index 43d74e1b..cca52e16 100644
--- a/client/src/components/portfolio/ProjectForm.vue
+++ b/client/src/components/portfolio/ProjectForm.vue
@@ -44,7 +44,24 @@
       >
         Speichern
       </button>
+<<<<<<< HEAD
       <router-link to="/portfolio" tag="button" class="button"> Abbrechen </router-link>
+||||||| parent of c96f9b5b (Remove obsolete tag attributes)
+      <router-link
+        to="/portfolio"
+        tag="button"
+        class="button"
+      >
+        Abbrechen
+      </router-link>
+=======
+      <router-link
+        to="/portfolio"
+        class="button"
+      >
+        Abbrechen
+      </router-link>
+>>>>>>> c96f9b5b (Remove obsolete tag attributes)
     </template>
   </page-form>
 </template>
diff --git a/client/src/components/portfolio/ProjectListItem.vue b/client/src/components/portfolio/ProjectListItem.vue
index d4f74fcd..c84a2ca2 100644
--- a/client/src/components/portfolio/ProjectListItem.vue
+++ b/client/src/components/portfolio/ProjectListItem.vue
@@ -1,8 +1,15 @@
 <template>
   <li class="project">
     <router-link
+<<<<<<< HEAD
       :to="{ name: 'project', params: { slug: project.slug } }"
       tag="div"
+||||||| parent of c96f9b5b (Remove obsolete tag attributes)
+      :to="{name: 'project', params: {slug: project.slug}}"
+      tag="div"
+=======
+      :to="{name: 'project', params: {slug: project.slug}}"
+>>>>>>> c96f9b5b (Remove obsolete tag attributes)
       class="project__link"
       data-cy="project-link"
     >
diff --git a/client/src/components/rooms/RoomEntry.vue b/client/src/components/rooms/RoomEntry.vue
index 1e281460..043649b9 100644
--- a/client/src/components/rooms/RoomEntry.vue
+++ b/client/src/components/rooms/RoomEntry.vue
@@ -1,8 +1,47 @@
 <template>
+<<<<<<< HEAD
   <div class="room-entry" data-cy="room-entry">
     <router-link :to="{ name: 'article', params: { slug: slug } }" class="room-entry__router-link" tag="div">
       <div class="room-entry__header" v-if="image">
         <img :src="image" :alt="title" class="room-entry__image" />
+||||||| parent of c96f9b5b (Remove obsolete tag attributes)
+  <div
+    class="room-entry"
+    data-cy="room-entry"
+  >
+    <router-link
+      :to="{name: 'article', params: { slug: slug }}"
+      class="room-entry__router-link"
+      tag="div"
+    >
+      <div
+        class="room-entry__header"
+        v-if="image"
+      >
+        <img
+          :src="image"
+          :alt="title"
+          class="room-entry__image"
+        >
+=======
+  <div
+    class="room-entry"
+    data-cy="room-entry"
+  >
+    <router-link
+      :to="{name: 'article', params: { slug: slug }}"
+      class="room-entry__router-link"
+    >
+      <div
+        class="room-entry__header"
+        v-if="image"
+      >
+        <img
+          :src="image"
+          :alt="title"
+          class="room-entry__image"
+        >
+>>>>>>> c96f9b5b (Remove obsolete tag attributes)
       </div>
       <div class="room-entry__content">
         <h2 class="room-entry__title">
diff --git a/client/src/components/rooms/RoomForm.vue b/client/src/components/rooms/RoomForm.vue
index 1018eb3b..f7d186dd 100644
--- a/client/src/components/rooms/RoomForm.vue
+++ b/client/src/components/rooms/RoomForm.vue
@@ -10,7 +10,24 @@
       <button type="submit" data-cy="room-form-save" class="button button--primary room-form__save-button">
         Speichern
       </button>
+<<<<<<< HEAD
       <router-link to="/rooms" tag="button" class="button"> Abbrechen </router-link>
+||||||| parent of c96f9b5b (Remove obsolete tag attributes)
+      <router-link
+        to="/rooms"
+        tag="button"
+        class="button"
+      >
+        Abbrechen
+      </router-link>
+=======
+      <router-link
+        to="/rooms"
+        class="button"
+      >
+        Abbrechen
+      </router-link>
+>>>>>>> c96f9b5b (Remove obsolete tag attributes)
     </template>
   </page-form>
 </template>
diff --git a/client/src/components/rooms/RoomWidget.vue b/client/src/components/rooms/RoomWidget.vue
index 4057de22..ae9a629b 100644
--- a/client/src/components/rooms/RoomWidget.vue
+++ b/client/src/components/rooms/RoomWidget.vue
@@ -1,6 +1,27 @@
 <template>
+<<<<<<< HEAD
   <div :class="roomClass" class="room-widget">
     <router-link :to="{ name: 'room', params: { slug: slug } }" tag="div" class="room-widget__content">
+||||||| parent of c96f9b5b (Remove obsolete tag attributes)
+  <div
+    :class="roomClass"
+    class="room-widget"
+  >
+    <router-link
+      :to="{name: 'room', params: {slug: slug}}"
+      tag="div"
+      class="room-widget__content"
+    >
+=======
+  <div
+    :class="roomClass"
+    class="room-widget"
+  >
+    <router-link
+      :to="{name: 'room', params: {slug: slug}}"
+      class="room-widget__content"
+    >
+>>>>>>> c96f9b5b (Remove obsolete tag attributes)
       <h2 class="room-widget__title">
         {{ title }}
       </h2>
diff --git a/client/src/components/school-class/ClassSelectionWidget.vue b/client/src/components/school-class/ClassSelectionWidget.vue
index 40384b30..72eac8d8 100644
--- a/client/src/components/school-class/ClassSelectionWidget.vue
+++ b/client/src/components/school-class/ClassSelectionWidget.vue
@@ -36,7 +36,6 @@
       >
         <router-link
           :to="{name: 'create-class'}"
-          tag="span"
           class="popover-links__link-with-icon"
         >
           <add-icon class="popover-links__icon" />
@@ -49,7 +48,6 @@
       >
         <router-link
           :to="{name: 'old-classes'}"
-          tag="span"
         >
           Alte Klassen anzeigen
         </router-link>
diff --git a/client/src/pages/instrumentOverview.vue b/client/src/pages/instrumentOverview.vue
index 0308a327..b106df32 100644
--- a/client/src/pages/instrumentOverview.vue
+++ b/client/src/pages/instrumentOverview.vue
@@ -10,7 +10,6 @@
       <router-link
         :to="{ name: 'instrument', params: { slug: instrument.slug } }"
         data-cy="instrument"
-        tag="div"
         v-for="instrument in filteredInstruments"
         :key="instrument.id"
       >
diff --git a/client/src/pages/start.vue b/client/src/pages/start.vue
index 835d2892..790d9108 100644
--- a/client/src/pages/start.vue
+++ b/client/src/pages/start.vue
@@ -17,7 +17,24 @@
             :key="index"
           />
         </div>
+<<<<<<< HEAD
         <router-link :to="topicRoute" tag="div" class="button"> Alle {{ $flavor.textModules }} anzeigen </router-link>
+||||||| parent of c96f9b5b (Remove obsolete tag attributes)
+        <router-link
+          :to="topicRoute"
+          tag="div"
+          class="button"
+        >
+          Alle {{ $flavor.textModules }} anzeigen
+        </router-link>
+=======
+        <router-link
+          :to="topicRoute"
+          class="button"
+        >
+          Alle {{ $flavor.textModules }} anzeigen
+        </router-link>
+>>>>>>> c96f9b5b (Remove obsolete tag attributes)
       </div>
       <div class="start-page__news news" data-cy="news-teasers" v-if="!me.readOnly">
         <h2 class="start-page__heading">News</h2>