jshint issue fix
Resolved mege conflict