diff --git a/app/views/verification/letter/edit.html.erb b/app/views/verification/letter/edit.html.erb
index 007fc13ad..3fddf9435 100644
--- a/app/views/verification/letter/edit.html.erb
+++ b/app/views/verification/letter/edit.html.erb
@@ -28,13 +28,6 @@
 
       <div class="small-12 medium-6">
         <%= form_for @letter, as: "letter", url: letter_path, method: :put do |f| %>
-          <% if @error %>
-            <div data-alert class="alert-box alert radius">
-              <a href="#" class="close">&times;</a>
-              <%= @error %>
-            </div>
-          <% end %>
-
           <%= f.text_field :verification_code, label: t("verification.letter.edit.confirmation_code") %>
           <%= f.submit t("verification.letter.new.send_code"), class: "button radius success" %>
         <% end %>
diff --git a/config/locales/verification.es.yml b/config/locales/verification.es.yml
index 13263c5fb..d5ebf8328 100644
--- a/config/locales/verification.es.yml
+++ b/config/locales/verification.es.yml
@@ -82,14 +82,11 @@ es:
           success: "Código correcto. Tu cuenta ya está verificada"
       alert:
         unconfirmed_code: "Todavía no has introducido el código de confirmación"
-<<<<<<< HEAD
         verify_attemps_left: "Has llegado al máximo número de intentos de verificar tu carta."
-=======
       errors:
         letter_not_sent: "Aún no te hemos enviado la carta con el código"
         incorect_code: "Código de verificación incorrecto"
         address_not_found: "No se ha encontrado una dirección"
->>>>>>> adds validation error for letter verification code [#395]
     verified_user:
       show:
         title: "Información disponible"