fixed ectopic '.' in package.json
fixed merge conflict in package.json