diff --git a/source/_includes/nav.html.twig b/source/_includes/nav.html.twig
index bbeddb6..67c40c1 100644
--- a/source/_includes/nav.html.twig
+++ b/source/_includes/nav.html.twig
@@ -1,5 +1,4 @@
 {% set links = [
-<<<<<<< HEAD
   {
     title: 'Tickets',
     href: site['tickets']['url'],
@@ -15,13 +14,13 @@
   {
     title: 'Speakers',
     href: '/#speakers',
-    active: page.layout in ['session', 'speaker'],
+    active: page.layout == 'speaker',
     enabled: true,
   },
   {
     title: 'Schedule',
     href: '/#schedule',
-    active: page.url == '/schedule' or page.layout in ['session', 'speaker'],
+    active: page.url == '/schedule' or page.layout == 'session',
     enabled: true,
   },
   {