fix option merging