fix: fixed analyzer issues and merge conflicts

lib/features/profile/models/chosen_diets_pagination_model.dart

@@ -26,7 +26,7 @@ abstract class ChosenDietModel with _$ChosenDietModel {
   factory ChosenDietModel.fromJson(Map<String, dynamic> json) => _$ChosenDietModelFromJson(json);
 }
 
-int? _parseDietId(json) {
+int? _parseDietId(dynamic json) {
   if (json == null) return null;
   return json['id'] as int?;
 }