fixing the favorite button at the bottom
solving merge conflict