Added text to introduce a conflict