jslint ok merged