fix default options merging