Favoritos DONE :tada:

guarda favoritos
conflict cleanup :dash: