resolve conflicts on app/views/layouts/nav/sidebar/_profile.html.haml

app/views/layouts/nav/sidebar/_profile.html.haml

@@ -28,7 +28,6 @@
             = link_to profile_account_path do
               %strong.fly-out-top-item-name
                 #{ _('Account') }
-<<<<<<< HEAD
       - if Gitlab::CurrentSettings.should_check_namespace_plan?
         = nav_link(controller: :billings) do
           = link_to profile_billings_path do
@@ -41,8 +40,6 @@
               = link_to profile_billings_path do
                 %strong.fly-out-top-item-name
                   #{ _('Billing') }
-=======
->>>>>>> upstream/master
       - if Gitlab::CurrentSettings.user_oauth_applications?
         = nav_link(controller: 'oauth/applications') do
           = link_to applications_profile_path do