Update src and view
Update conflicts