Fixed unneeded underscore import linting issue
Moved option merging into Utils, and removedOptionMerger