Merge didn't happen as well as expected.
missing jshint options