Correctly handle option caused conflict.
PR: 222845 Submitted by: O. Hartmann <ohartmann@walstatt.org>