Delete index.php
Delete index.html
do it

Conflicts:
	index.html