minor change
index.php: fix conflicts
Merge branch 'deltamaster-master'