JSLint debug
Merge conflict