diff --git a/layouts/shortcodes/program_entry.html b/layouts/shortcodes/program_entry.html
index e67eaa4ae..a151c81b9 100644
--- a/layouts/shortcodes/program_entry.html
+++ b/layouts/shortcodes/program_entry.html
@@ -1,9 +1,5 @@
 <!-- this div is repeated for each timeslot -->
-<<<<<<< HEAD
-{{ $path := split .Page.Source.File.Path .Site.Params.PathSeperator }}
-=======
 {{ $path := split .Page.Source.File.Path .Site.Params.pathseperator }}
->>>>>>> 12b193aaf8179c1c32318267861f35f3cdea82e4
 {{ $event_slug := index $path 1 }}
 {{ $e :=  (index $.Site.Data.events $event_slug) }}
 {{ $city_slug := substr $e.name 5 }}