JSHint
Merge