Resolve conflicts following new LineBreakAroundConditionalBlock cop

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/controllers/omniauth_callbacks_controller.rb

@@ -87,7 +87,6 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
       handle_service_ticket oauth['provider'], ticket
     end
 
-<<<<<<< HEAD
     handle_omniauth
   end
 
@@ -98,8 +97,6 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     # omniauth-kerberos gem and rename the internal 'kerberos_spnego'
     # provider to plain 'kerberos' and remove this special method.
     oauth['provider'] = 'kerberos'
-=======
->>>>>>> upstream/master
     handle_omniauth
   end
 

app/helpers/nav_helper.rb

@@ -11,12 +11,8 @@ module NavHelper
     if current_path?('merge_requests#show') ||
         current_path?('projects/merge_requests/conflicts#show') ||
         current_path?('issues#show') ||
-<<<<<<< HEAD
         current_path?('milestones#show') ||
         current_path?('epics#show')
-=======
-        current_path?('milestones#show')
->>>>>>> upstream/master
 
       if cookies[:collapsed_gutter] == 'true'
         %w[page-gutter right-sidebar-collapsed]