# Conflicts: # package-lock.json # package.json # server/database.js # src/languages/en.js # src/mixins/socket.js