Update index view
Fix conflict in index