fixing delete link_to in index
fixing merge conflict