Upgrade version
Update mocks module name
Changing async version
updating package.json
Correcting merge