jslint fixes
conflict fixes