adding basic collection view for favorites
merge conflicts