Fix up merge_options declaration