Fix merging options