resolved conflict in views.py