fixed option merge