made changes in index.php
made changes in index.php from master
conflic index.php