conflict resolved in tbldata/index view file