adding favorites pseudo functionality
resolving merge conflicts