resolved conflict in views.py
resolved conflict in views.py 2