update view
merge conflict