Fixing additional conflict options.