Fix options merge