chore: fixed merge conflict

Makefile

cypress/e2e/homeView.cy.ts

package-lock.json

package.json

src/assets/archerSpare.gif

src/assets/backgroundSavingsPath.png

src/assets/bioAuthFace.png

src/assets/bioAuthTouch.png

src/assets/boatSpare.gif

src/assets/borderImage.png

src/assets/farmerSpare.gif

src/assets/finishLine.png

src/assets/flower.png

src/assets/infoIcon.png

src/assets/pengesekkStreak.png

src/assets/savingsPathBg.png

src/components/ButtonDIsplayStreak.vue

src/components/ButtonDisplayStreak.vue

src/components/DisplayInfoForChallengeOrGoal.vue

src/components/FormLogin.vue