added if statement to prevent no lists error
fixing merge conflicts