index.php modified
conflict resolved