Fix conflict options.