Fixed a conflict
Text changes