diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb
index ee6481b86df209cc37b3f6b881061e5f8ff50cdd..58a92387b5c48717f6216ba905df4171c8858056 100644
--- a/actionpack/lib/action_view/helpers/javascript_helper.rb
+++ b/actionpack/lib/action_view/helpers/javascript_helper.rb
@@ -215,7 +215,10 @@ def add_confirm_to_attributes!(html_options, confirm)
       end
 
       def add_method_to_attributes!(html_options, method, url = nil)
+<<<<<<< HEAD
         html_options["rel"] = "nofollow" if method.to_s.downcase == "delete"
+=======
+>>>>>>> making non remote versions of link_to, button_to, submit_tag and image_submit_tag output data attributes for things like :confirm, :method, :popup, and :disable_with
         html_options["data-method"] = method
         if url.size > 0
           html_options["data-url"] = url