updated the text
conflicts :D