chore: fixed merge conflict

cypress/e2e/homeView.cy.ts

src/App.vue

src/assets/base.css

src/assets/hjelp.png

src/assets/varsel.png

src/components/CardTemplate.vue

src/components/ContinueButtonComponent.vue

src/components/FormLogin.vue

src/components/FormRegister.vue

src/components/InteractiveSpare.vue

src/components/ModalComponent.vue

src/components/NavBarComponent.vue

src/components/SavingsPath.vue

src/components/__tests__/InteractiveSpareTest.spec.ts

src/components/__tests__/NavBarTest.spec.ts

src/router/index.ts

src/services/authInterceptor.ts

src/stores/userConfigStore.ts

src/stores/userStore.ts

src/types/profile.ts