fixed merge conflict in words/show.html.erb
cleaned up word show html file