re-submitting index.html
Re-Edited Conflict file