Resolve merge confilct

backend/app.js

backend/models/user.js

backend/package-lock.json

backend/package.json

backend/public/index.html

...ublic/static/css/app.ccb68ba7cfae28d82f4d82f5312497e8.css

...c/static/css/app.ccb68ba7cfae28d82f4d82f5312497e8.css.map

backend/public/static/js/app.5d532d316e2a3bb58324.js

backend/public/static/js/app.5d532d316e2a3bb58324.js.map

...end/public/static/js/manifest.2ae2e69a05c33dfc65f8.js.map

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

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

backend/public/static/js/vendor.cb29043f681d8df309ac.js

backend/public/static/js/vendor.cb29043f681d8df309ac.js.map

backend/routes/books.js

backend/routes/login.js

frontend/package-lock.json

frontend/package.json

frontend/src/App.vue

frontend/src/components/dashBoard.vue