Merging conflict

backend/public/static/js/vendor.9dc773b211119751e4e4.js

backend/public/static/js/vendor.9dc773b211119751e4e4.js.map

backend/routes/books.js

frontend/src/App.vue

frontend/src/assets/check-icon.png

frontend/src/assets/icon-add.svg

frontend/src/assets/x-512.png

frontend/src/components/BookSearchPage.vue

frontend/src/components/dashBoard.vue

frontend/src/components/home.vue

frontend/src/components/home_hotlist/Hotlist.vue

frontend/src/components/mainpage.vue

frontend/src/components/profile.vue

frontend/src/components/profilecomponent/buylist.vue

frontend/src/components/profilecomponent/profiledit.vue

frontend/src/components/profilecomponent/sellist.vue

frontend/src/router/index.js