Teach MergeOptions rename detection