merge conflict resolved in events show.html.erb
merge conflict resolved in events show.html.erb