Remove conflict from shipments.js.erb