fixing merge conflicts in views.py