added different text for conflict challenge