Fixed conflict on checkout.html.erb