Fix options deep merge