removed jshint from top
conflict resolved n merged