add conflict echo
add echo
Revert "changed index.php"

This reverts commit 0b4efdd12b5272b08bcdd642907a1c013da1b733.
Revert "Revert "changed index.php""

This reverts commit 1ecd44962b43bb11e3f3a8863da7afec6f872c8b.
Updating file php