add text for conflict