Resolved merge conflicts

node_modules/.bin/bcrypt

node_modules/.bin/bcrypt.cmd

node_modules/.bin/bcrypt.ps1

node_modules/.package-lock.json

node_modules/bcryptjs/LICENSE

node_modules/bcryptjs/README.md

node_modules/bcryptjs/bin/bcrypt

node_modules/bcryptjs/index.d.ts

node_modules/bcryptjs/index.js

node_modules/bcryptjs/package.json

node_modules/bcryptjs/types.d.ts

node_modules/bcryptjs/umd/index.d.ts

node_modules/bcryptjs/umd/index.js

node_modules/bcryptjs/umd/package.json

node_modules/bcryptjs/umd/types.d.ts

package-lock.json

package.json

server.js