fixing merge conflict in showrecipesactivity'