diff --git a/Gemfile.lock b/Gemfile.lock
index 7d178e7e4..e3088b30d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -165,11 +165,11 @@ GEM
     foundation-rails (5.5.3.2)
       railties (>= 3.1.0)
       sass (>= 3.3.0, < 3.5)
-    foundation_rails_helper (1.0.0)
-      actionpack (~> 4.1, >= 4.1.1)
-      activemodel (~> 4.1, >= 4.1.1)
-      activesupport (~> 4.1, >= 4.1.1)
-      railties (~> 4.1, >= 4.1.1)
+    foundation_rails_helper (1.1.0)
+      actionpack (~> 4.1)
+      activemodel (~> 4.1)
+      activesupport (~> 4.1)
+      railties (~> 4.1)
       tzinfo (~> 1.2, >= 1.2.2)
     fuubar (2.0.0)
       rspec (~> 3.0)
diff --git a/README_ES.md b/README_ES.md
index 67c3523ab..8fd1dd2f1 100644
--- a/README_ES.md
+++ b/README_ES.md
@@ -27,7 +27,10 @@ Las herramientas utilizadas para el frontend no están cerradas aún. Los estilo
 Prerequisitos: tener instalado git, ImageMagick, Ruby 2.2.3, la gema `bundler`, ghostscript y PostgreSQL (9.4 o superior).
 
 ```
+<<<<<<< HEAD
 git clone https://github.com/consul/consul.git
+=======
+>>>>>>> upstream/master
 cd consul
 bundle install
 cp config/database.yml.example config/database.yml