Fix option merging