fix view.py conflicts