chore: resolve merge conflicts

src/router/index.js

@@ -40,7 +40,7 @@ const routes = [
         }
     },
     {
-        path: '/settings/:rest(.*)*',
+        path: '/settings',
         name: 'settings',
         component: SettingsView,
         meta: {
@@ -59,30 +59,17 @@ const router = createRouter({
     routes
 });
 
-// remove trailing slash(es)
+export const updatePageTitle = function updatePageTitle (route) {
-router.beforeEach((route) => {
-    if (route.path !== '/' && route.path.endsWith('/')) {
-        return {
-            path: route.path.replace(/\/+$/, ''),
-            query: route.query,
-            hash: route.hash,
-            replace: true
-        };
-    };
-});
-
-// set page title
-router.afterEach(to => {
     const title =
-        typeof to.meta.title === 'function'
+        typeof route.meta.title === 'function'
-        ? to.meta.title(to)
+        ? route.meta.title(route)
-        : to.meta.title;
+        : route.meta.title;
 
     if (title) {
         document.title = `${title} - Seekra`;
     } else {
         document.title = 'Seekra';
     };
-});
+};
 
 export default router;