Protected notes in list view
Fixed merge conflict for listview