diff --git a/_config.yml b/_config.yml
index 54367d4..21863d0 100644
--- a/_config.yml
+++ b/_config.yml
@@ -44,7 +44,11 @@ c4sponsorsUrl: "/assets/GDG_DevFest_Partnership.pdf"
 navigationLinks:
  - {permalink: "/", text: "Home"}
  - {permalink: "/blog/", text: "Blog"}
+<<<<<<< HEAD
  - {permalink: "/schedule/", text: "Agenda"}
+=======
+ - {permalink: "/schedule/", text: "Programa"}
+>>>>>>> 35bc9b15177b50fbea6d4a62fe9832a8a82cada0
  - {permalink: "/speakers/", text: "Ponentes"}
  - {permalink: "/team/", text: "Equipo"}
  - {permalink: "/logistics/", text: "Logística"}