Change some text
Fix conflicts