Conflict in core/view.py