merged conflict on app/views/venues/show.html.erb