proper option merging