converted multiple containers to one & code clean+indentationfor index.php
resolved merge conflict in index.php