Repaired option merging.