Fixed option merge