Fixing merge conflict on package.json.
Merge remote-tracking branch 'origin/master'