Resolve conflict in app/views/layouts/_page.html.haml

app/views/layouts/_page.html.haml

@@ -8,10 +8,7 @@
       = render "layouts/header/ee_license_banner"
       = render "layouts/broadcast"
       = render 'layouts/header/read_only_banner'
-<<<<<<< HEAD
       = render "layouts/nav/ee/classification_level_banner"
-=======
->>>>>>> upstream/master
       = yield :flash_message
       - unless @hide_breadcrumbs
         = render "layouts/nav/breadcrumbs"