Fixing manager.js merge.
Fixing pull request.