Move Conflict text into Conflict