I changed the text
merge conflict solved yeah