Changed some text.
Fixed merge conflict