corrected automerged switches in options.h