help and favourites
fix merge