- fixed conflict in views.py