Fixed merge conflict in models.py from login