diff --git a/app/auth/views.py b/app/auth/views.py
index 69193d56..04afc1e6 100644
--- a/app/auth/views.py
+++ b/app/auth/views.py
@@ -1,9 +1,5 @@
 from flask import flash, redirect, render_template, request, url_for
-<<<<<<< HEAD
-from flask_login import login_required, login_user, logout_user, current_user
-=======
 from flask_login import current_user, login_required, login_user, logout_user
->>>>>>> 1a973bfbc68dfea26a8b5360074480641cb34f31
 from . import auth
 from .. import db
 from .forms import LoginForm, PasswordResetRequestForm, RegistrationForm