final version, index.php extremely bloated
merge
conflict merge