Changed order of merging options and defaults