diff --git a/pagure/templates/login/password_recover.html b/pagure/templates/login/password_recover.html
index 2b22488..310163d 100644
--- a/pagure/templates/login/password_recover.html
+++ b/pagure/templates/login/password_recover.html
@@ -5,7 +5,7 @@
 {%block tag %}home{% endblock %}
 
 {% block content %}
-<<<<<<< HEAD
+
 <div class="container">
   <div class="row">
     <div class="col-md-8 col-md-offset-2">
diff --git a/pagure/templates/user_settings.html b/pagure/templates/user_settings.html
index 717453a..0ff9e40 100644
--- a/pagure/templates/user_settings.html
+++ b/pagure/templates/user_settings.html
@@ -38,7 +38,6 @@
 
 
 {% block content %}
-<<<<<<< HEAD
 <div class="container p-t-3">
   <div class="col-md-8 col-md-offset-2">
     <div class="card m-b-3">
@@ -65,26 +64,6 @@
             </a>
       </div>
       <div class="list-group list-group-flush">
-=======
-<section class="user_settings">
-    <header>
-        <h2>{{ user.user }}'s settings</h2>
-    </header>
-    <table>
-      <tr>
-        <th>Full name</th>
-        <td> {{ user.fullname }} </td>
-      </tr>
-      <tr>
-        <td>
-            {% if config.get('PAGURE_AUTH')=='local' %}
-                <a href="{{ url_for('change_password', username=g.fas_user.username) }}">Change password</a>
-            {% endif %}
-        </td>
-     </tr>
-      <tr>
-        <th>Emails</th>
->>>>>>> Add a change password link for local auth
         {% for email in user.emails %}
           {{ render_email(email, form) }}
         {% endfor %}
diff --git a/pagure/ui/login.py b/pagure/ui/login.py
index e0c045d..6343233 100644
--- a/pagure/ui/login.py
+++ b/pagure/ui/login.py
@@ -119,6 +119,7 @@ def do_login():
         elif user_obj.token:
             flask.flash(
                 'Invalid user, did you confirm the creation with the url '
+
                 'provided by email?', 'error')
             return flask.redirect(flask.url_for('auth_login'))
 
@@ -248,6 +249,7 @@ def reset_password(token):
 
     if form.validate_on_submit():
 
+
         user_obj.password = generate_hashed_value(form.password.data)
 
         user_obj.token = None