Resolve merge conflict

.gitignore

backend/app.js

backend/package-lock.json

backend/package.json

backend/routes/emails.js

frontend/src/components/BookSearchPage.vue

frontend/src/components/home.vue

frontend/src/components/profilecomponent/buylist.vue