diff --git a/_config.yml b/_config.yml
index a8adeb5..8e14da8 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"}
@@ -55,9 +59,15 @@ rightNavigationButtons:
  - {link: "https://bit.ly/dfua-c4p", text: "Become a speaker"}
 
 # Hero Block
+<<<<<<< HEAD
 heroImage: "hero.jpg"
 heroTitle: "DataMad <typeout> 2017"
 eventDate: "Octubre - November, 2017"
+=======
+homeImage: "medialab_exterior_architizer.jpg"
+heroTitle: "GDG DevFest <typeout> 2014"
+eventDate: "September - November, 2014"
+>>>>>>> 99a0f6355d3350aa5eb5e8570a0672989bf8efce
 typeoutTextValues: '"", "Season", "Ukraine", "Germany", "USA"'
 typeoutFallback: "Season"
 heroButtons:
diff --git a/_includes/hero.html b/_includes/home.html
similarity index 94%
rename from _includes/hero.html
rename to _includes/home.html
index 068b15b..b10d389 100644
--- a/_includes/hero.html
+++ b/_includes/home.html
@@ -1,5 +1,5 @@
 <!-- Begin Hero Section -->
-<section id="top-section-hero" class="top-section-hero top-section image-section" style="background-image: url('{{ site.baseurl }}/img/sections-background/{{ site.heroImage }}');">
+<section id="top-section-hero" class="top-section-hero top-section image-section" style="background-image: url('{{ site.baseurl }}/img/sections-background/{{ site.homeImage }}');">
     {% include navigation.html %}
     <div class="content-wrapper">
     <div class="jumbotron">
@@ -19,4 +19,4 @@
     </a>
     </div>
 </section>
-<!-- End Hero Section -->
\ No newline at end of file
+<!-- End Hero Section -->
diff --git a/index.html b/index.html
index 831608c..ee695d6 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@ layout: default
 permalink: /
 ---
 
- {% include hero.html %}
+ {% include home.html %}
 
  {% include about.html %}