updated packages.json
updated packages.json
setup socket authorization
CONFLICT RESOLVED