merged conflicts for views