formated package.json
fixed conflict