Attempted to add viewlistitems
Merged changes