diff --git a/pagure/templates/login/password_change.html b/pagure/templates/login/password_change.html
index 26a5836..bef3946 100644
--- a/pagure/templates/login/password_change.html
+++ b/pagure/templates/login/password_change.html
@@ -1,7 +1,6 @@
 {% extends "master.html" %}
 {% from "_formhelper.html" import render_bootstrap_field %}
 
-<<<<<<< HEAD
 {% block title %}Lost password{% endblock %}
 {% set tag = "home" %}
 
@@ -26,27 +25,5 @@
     </div>
   </div>
 </div>
-=======
-{% block title %}Change password{% endblock %}
-{%block tag %}home{% endblock %}
-
-{% block content %}
-<h2>Change password</h2>
-
-<form action="{{ url_for('change_password', username=g.fas_user.username) }}" method="POST">
-  <table>
-    {{ render_field_in_row(form.old_password) }}
-    {{ render_field_in_row(form.password) }}
-    {{ render_field_in_row(form.confirm_password) }}
-  </table>
-  <p class="buttons indent">
-    <input type="submit" class="submit positive button" value="Update">
-    <a href="{{ url_for('index') }}">
-      <input type="button" value="Cancel" class="button">
-    </a>
-    {{ form.csrf_token }}
-  </p>
-</form>
->>>>>>> Add a change password link for local auth
 
 {% endblock %}
diff --git a/pagure/templates/login/password_recover.html b/pagure/templates/login/password_recover.html
index a61a452..2b22488 100644
--- a/pagure/templates/login/password_recover.html
+++ b/pagure/templates/login/password_recover.html
@@ -5,6 +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/ui/login.py b/pagure/ui/login.py
index da14423..e0c045d 100644
--- a/pagure/ui/login.py
+++ b/pagure/ui/login.py
@@ -13,7 +13,6 @@ import hashlib
 import datetime
 import urlparse
 import bcrypt
-from kitchen.text.converters import to_unicode, to_bytes
 
 import flask
 from sqlalchemy.exc import SQLAlchemyError