update favs
merge