Fixing JSHint errors.
Fixing merge issues.