fixed favourites bugs
conflict resolution