jshint, bugfixes
conflict
conflict