added text for conflict challenge
Changing text for conflict challenge
final changes
Merge pull request #3 from yandrew/small-conflict

Small conflict