Delete obsolete view
Fix conflict