diff --git a/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb b/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
index 63b4ba49e9b6e8d05dc0d78437a83418f3027f7b..01863a162b95e6cfe48480a72c46130445a83f30 100644
--- a/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
+++ b/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
@@ -3,23 +3,12 @@ class Hash
#
# options = options.reverse_merge(:size => 25, :velocity => 10)
#
-<<<<<<< HEAD
- # The default :size and :velocity are only set if the +options+ hash passed in doesn't already
- # have the respective key.
- #
- # As contrast, using Ruby's built in merge would require writing the following:
- #
- # def setup(options = {})
- # options = { :size => 25, :velocity => 10 }.merge(options)
- # end
-=======
# is equivalent to
#
# options = {:size => 25, :velocity => 10}.merge(options)
#
# This is particularly useful for initializing an options hash
# with default values.
->>>>>>> 20768176292cbcb883ab152b4aa9ed8c664771cd
def reverse_merge(other_hash)
other_hash.merge(self)
end
diff --git a/activesupport/lib/active_support/core_ext/object/blank.rb b/activesupport/lib/active_support/core_ext/object/blank.rb
index 7b5832b51a0059eece8067f8ba6996cdd8c070fb..d0c1ea8326edc2c9cd960f8d6cfdf41fe99206cf 100644
--- a/activesupport/lib/active_support/core_ext/object/blank.rb
+++ b/activesupport/lib/active_support/core_ext/object/blank.rb
@@ -13,11 +13,7 @@ def blank?
respond_to?(:empty?) ? empty? : !self
end
-<<<<<<< HEAD
- # An object is present if it's not #blank?.
-=======
# An object is present if it's not blank?.
->>>>>>> 20768176292cbcb883ab152b4aa9ed8c664771cd
def present?
!blank?
end