Merging conflict

backend/data/books.json

backend/models/Book.js

backend/models/transaction.js

backend/public/index.html

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

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

...ublic/static/css/app.d23ad4f968f75bc1fdc1e08ce69223ca.css

...c/static/css/app.d23ad4f968f75bc1fdc1e08ce69223ca.css.map

...ublic/static/css/app.ec2d265986b1f9dcd1cffe8ec691bc1f.css

...c/static/css/app.ec2d265986b1f9dcd1cffe8ec691bc1f.css.map

backend/public/static/img/book-open-flat.a6d64f7.png

backend/public/static/img/img1.e3d64af.jpg

backend/public/static/img/img1.jpg

backend/public/static/js/app.1c070e861afe7dc1467b.js

backend/public/static/js/app.1c070e861afe7dc1467b.js.map

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

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

backend/public/static/js/app.d7bc7e91d6675626d211.js

backend/public/static/js/app.d7bc7e91d6675626d211.js.map

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