fixed jslint issues (caused after using mergetool)