can't get checklistitems to work :(
fixing merge conflict