Rework MergeOptions method