I have edited text for conflict2