patch.diff

diff --git a/app/views/collections/_fields.html.slim b/app/views/collections/_fields.html.slim
index 7309524..d576241 100644
--- a/app/views/collections/_fields.html.slim
+++ b/app/views/collections/_fields.html.slim
@@ -1,15 +1,10 @@
 = render 'shared/error_messages', model: @collection
 
-<<<<<<< HEAD
-= f.label :name
-= f.text_field :name
-
-= f.radio_button :visibility, 1
-= f.label :visibility_private, 'private'
-= f.radio_button :visibility, 0, checked: true
-= f.label :visibility_public, 'public'
-=======
 div.field
   = f.label :name
   = f.text_field :name
->>>>>>> b52c5cead76a74e65056476015d0bf8fb391b1f3
+
+  = f.radio_button :visibility, 1
+  = f.label :visibility_private, 'private'
+  = f.radio_button :visibility, 0, checked: true
+  = f.label :visibility_public, 'public'
diff --git a/app/views/users/show.html.slim b/app/views/users/show.html.slim
index 4017284..7759a1e 100644
--- a/app/views/users/show.html.slim
+++ b/app/views/users/show.html.slim
@@ -2,12 +2,8 @@
 
 h1
   = gravatar_for @user
-<<<<<<< HEAD
-  = "#{@user.firstname} #{@user.name}"
-=======
   '
-  = @user.name
->>>>>>> b52c5cead76a74e65056476015d0bf8fb391b1f3
+  = "#{@user.firstname} #{@user.name}"
 
 - if current_user
   - unless current_user? @user
@@ -28,23 +24,23 @@ h1
       = link_to "#{@user.firstname} #{@user.name}", @user
       '  | 
       = link_to 'Add friend?', friends_path(user_id: @user), method: :post
-  
+
   p
     - if @user.admin?
       | ADMIN
-  
+
   - if current_user? @user
     h2 My Friends
-  
+
     ul
       - @user.friends.map do |f|
         li
           = link_to "#{f.firstname} #{f.name}", f
           '  | 
           = link_to 'Unfriend', friend_path(f), method: :delete
-  
+
     h2 Pending Friends
-    
+
     ul
       - current_user.pending_invited_by.map do |f|
         li