remove merge artifacts in options.h