jslint fixes
merge conflict fix