Update view
Merge conflicts