Fix conflict in app/views/layouts/terms.html.haml

app/views/layouts/terms.html.haml

@@ -29,10 +29,6 @@
                         = link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do
                           = image_tag avatar_icon_for_user(current_user, 23), width: 23, height: 23, class: "header-user-avatar qa-user-avatar"
                           = sprite_icon('angle-down', css_class: 'caret-down')
-<<<<<<< HEAD
-                        .dropdown-menu-nav.dropdown-menu-right
-=======
                         .dropdown-menu.dropdown-menu-right
->>>>>>> gitlab-ce/master
                           = render 'layouts/header/current_user_dropdown'
               = yield