fix options merge bug