chore: fixed merge conflict

cypress/e2e/login.cy.ts

cypress/e2e/register.cy.ts

package-lock.json

package.json

src/App.vue

src/assets/SPARESTI.png

src/assets/base.css

src/assets/coffee.png

src/assets/coins.png

src/assets/completed.png

src/assets/cowboySpare.gif

src/assets/finishLine.png

src/assets/golfSpare.gif

src/assets/hotAirBalloonSpare.gif

src/assets/main.css

src/assets/mat.png

src/assets/pending.png

src/assets/penger.png

src/assets/sleepingSpare.gif

src/assets/spare.png