fixed options merge