Fixed jshint error
Fixed merge errors