removed <<<<<<< HEAD from index.html.erb