removed jslint (performance issue)
fixed merge error