Resolve conflicts in _form.html.haml

app/views/admin/application_settings/_form.html.haml

@@ -828,7 +828,7 @@
             if you have configured your OpenSSH server to use the
             AuthorizedKeysCommand. Click on the help icon for more details.
             = link_to icon('question-circle'), help_page_path('administration/operations/fast_ssh_key_lookup')
-<<<<<<< HEAD
+
   - if Gitlab.com? || Rails.env.development?
     %fieldset
       %legend Slack application
@@ -865,8 +865,6 @@
           .help-block
             The amount of seconds after which a request to get a secondary node
             status will time out.
-=======
->>>>>>> upstream/master
 
   %fieldset
     %legend User and IP Rate Limits