added different text for conflict challenge
final changes