temp.txt added and index.php changed
TEMP.txt added
conflict resolved index.php