fixed merge conflict in views.py