Fix merge error in options.sh