diff --git a/lib/mail/utilities.rb b/lib/mail/utilities.rb
index 85329c1ca..6ac2243f9 100644
--- a/lib/mail/utilities.rb
+++ b/lib/mail/utilities.rb
@@ -177,6 +177,7 @@ def underscoreize( str )
       str.to_s.downcase.gsub('-', '_')
     end
 
+<<<<<<< HEAD
     if RUBY_VERSION <= '1.8.6'
 
       def map_lines( str, &block )
diff --git a/test.rb b/test.rb
new file mode 100644
index 000000000..c378edc6a
--- /dev/null
+++ b/test.rb
@@ -0,0 +1,13 @@
+require 'rubygems'
+require 'mail'
+require 'ruby-debug'
+
+smtp = { :address => 'mail.fiendz.org', :port => 587, :domain => 'fiendz.org', :user_name => 'test@fiendz.org', :password => 'foobar', :enable_starttls_auto => true, :openssl_verify_mode => 'none' }
+Mail.defaults { delivery_method :smtp, smtp }
+mail = Mail.new do
+  from 'test@fiendz.org'
+  to 'donald.ball@gmail.com'
+  subject 'subject'
+  body 'body'
+end
+mail.deliver!