Update displayFavorites
Fixed merger errors