diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index 9d3f66fe743..3edd76a7c1b 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -20,12 +20,11 @@
 
 .row
   .span6
-<<<<<<< HEAD
     .ui-box
       %h5.title
         Account:
         .pull-right
-          = image_tag gravatar_icon(@admin_user.email, 32), class: "avatar s32", alt: ''
+          = image_tag gravatar_icon(@admin_user.email, 32), class:"avatar s32", alt:""
       %ul.well-list
         %li
           %span.light Name: