fixed merge conflicts

src/hooks.server.ts

@@ -0,0 +1,16 @@
+import { decryptToken } from '$lib/auth';
+import type { Handle } from '@sveltejs/kit';
+
+export const handle: Handle = ({ event, resolve }) => {
+	const jwt = event.cookies.get('session');
+	try {
+		if (jwt) {
+			event.locals.user = decryptToken(jwt);
+			return resolve(event);
+		}
+	} catch (_) {
+		event.cookies.delete('session', {path: '/'});
+		event.locals.user = null;
+	}
+	return await resolve(event);
+}