app/views/merges/find_person.html.haml in artfully_ose-1.2.0 vs app/views/merges/find_person.html.haml in artfully_ose-1.3.0.pre1

@@ -10,16 +10,18 @@
       %ul
         %li
           = text_field_tag :search, "", :placeholder => "Email address or name", :class => "input-medium search-query"
           = submit_tag "Search", :class => 'btn'
     %p
-      All notes, actions, phone numbers, and tags from 
+      All notes, actions, mailing addresses, phone numbers, and tags from
       %strong= @loser
       will be merged into the #{@loser.type.downcase} record you select on this screen.
+
     %p
-      Mailing address, email, company name, and website for
+      The following will be retained from
       %strong= @loser
-      will be discarded.
+      if not present in the record you select: email, middle name, company name, nickname, listing name, maiden name, title, salutation, suffix, twitter handle, facebook url, linkedin url, website, and birth date.
+
     %p
       You'll have a chance to confirm all of this before we perform the merge.
   .span8.super-search-results
     - if @people.empty?
        
\ No newline at end of file