fix: fixed analyzer issues and merge conflicts

lib/features/feed/presentation/widgets/comments_widget.dart

@@ -53,7 +53,7 @@ class _CommentsWidgetState extends State<CommentsWidget> {
     );
   }
 
-  _comment(S s, Comment comment, [double radius = 18, bool isChild = false]) {
+  Container _comment(S s, Comment comment, [double radius = 18, bool isChild = false]) {
     return Container(
       width: MediaQuery.of(context).size.width,
       decoration: BoxDecoration(

lib/features/feed/presentation/widgets/consultant_widget.dart

@@ -121,7 +121,7 @@ class ConsultantWidget extends StatelessWidget {
     );
   }
 
-  _badges(List<BadgeModel> badges, BuildContext context) {
+  SingleChildScrollView _badges(List<BadgeModel> badges, BuildContext context) {
     return SingleChildScrollView(
       scrollDirection: Axis.horizontal,
       child: Row(

lib/features/feed/presentation/widgets/recipes_widget.dart

@@ -262,7 +262,7 @@ class _RecipesWidgetState extends State<RecipesWidget> {
     );
   }
 
-  _iconButton(String iconPath, [String? text]) {
+  Container _iconButton(String iconPath, [String? text]) {
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
       decoration: BoxDecoration(

lib/features/feed/presentation/widgets/tags_modal_widget.dart

@@ -42,7 +42,7 @@ class _TagsModalWidgetState extends State<TagsModalWidget> {
     );
   }
 
-  _tagChip({
+  ChoiceChip _tagChip({
     required RecipeTag tag,
     required bool isSelected,
   }) {