Toggle adding/removing favorites
merge conflict fixes