resolve merge conflict

.gitignore

.gitlab-ci.yml

Dockerfile

docker-compose.yml

package-lock.json

package.json

playwright.config.ts

src/demo.spec.ts

src/index.test.ts

src/lib/components/ThemeToggle.svelte

src/lib/stores/layout.svelte.ts

src/routes/(app)/+layout.svelte

svelte.config.js

tests/default.test.ts

tests/e2e/demo.test.ts

vite.config.ts