solve code reviews, resolve rebase conflicts

app/views/conference_registrations/show.html.haml

@@ -94,18 +94,14 @@
             = "(#{@tickets.first.price.symbol}#{humanized_money @total_price})"
         %ul
           .col.md-4
-            - @ticket_payments.each_pair do |payment, tickets|
-              %strong
-                Purchased
-              - tickets.each do |ticket|
-                %li
-                  = ticket.quantity
-                  = ticket.title
-                  = word_pluralize(ticket.quantity, 'Ticket')
-                  for
-                  = ticket.price.symbol
-                  = humanized_money ticket.price
-              %hr
+            - @ticket_payments.each_pair do |ticket_id, tickets|
+              %li
+                = @total_quantity[ticket_id]
+                = tickets.first.title
+                = word_pluralize(@total_quantity[ticket_id], 'Ticket')
+                for
+                = tickets.first.price.symbol
+                = humanized_money tickets.first.price
           - if @tickets.any?
             = link_to 'Buy more tickets', conference_tickets_path(@conference.short_title), class: "btn btn-default"
           - else

app/views/payments/_payment.html.haml

@@ -31,4 +31,4 @@
         = number_to_currency @total_amount_to_pay
   .form-group
     = f.submit "Charge Card", class: "btn btn-primary"
-    = link_to "Cancel", conference_conference_registrations_path, class: "btn btn-danger"
+    = link_to "Cancel", conference_conference_registration_path, class: "btn btn-danger"

app/views/tickets/index.html.haml

@@ -37,7 +37,7 @@
             = button_tag(type: 'submit', class: 'btn btn-success btn-lg') do
               Continue
               %i.fa.fa-shopping-cart
-            = link_to 'Cancel registration', conference_conference_registrations_path(@conference.short_title), method: :delete, class: 'btn btn-danger btn-sm'
+            = link_to 'Cancel registration', conference_conference_registration_path(@conference.short_title), method: :delete, class: 'btn btn-danger btn-sm'
   .row
     .col-md-13
       %p.text-muted.text-center