diff --git a/Filament/Widgets/GroupWidget.php b/Filament/Widgets/GroupWidget.php
index 8c23414f..ae444a4e 100755
--- a/Filament/Widgets/GroupWidget.php
+++ b/Filament/Widgets/GroupWidget.php
@@ -18,6 +18,9 @@ class GroupWidget extends BaseWidget
     public array $widgets = [];
 
     public string $title = '';
+<<<<<<< HEAD
 
+=======
+>>>>>>> up
     public string $icon = '';
 }
diff --git a/Filament/Widgets/HeroWidget.php b/Filament/Widgets/HeroWidget.php
index 16c93ce6..ad655dab 100755
--- a/Filament/Widgets/HeroWidget.php
+++ b/Filament/Widgets/HeroWidget.php
@@ -24,11 +24,20 @@ protected function getStats(): array
     {
         return [
             Stat::make('', $this->title)
+<<<<<<< HEAD
                 // ->description('32k increase '.$startDate)
                 // ->descriptionIcon('heroicon-m-arrow-trending-up')
                 // ->chart([7, 2, 10, 3, 15, 4, 17])
                 // ->color('success')
                 ->icon($this->icon),
+=======
+                //->description('32k increase '.$startDate)
+                //->descriptionIcon('heroicon-m-arrow-trending-up')
+                //->chart([7, 2, 10, 3, 15, 4, 17])
+                //->color('success')
+                ->icon('heroicon-o-rectangle-stack')
+                ,
+>>>>>>> up
         ];
     }
 
diff --git a/Resources/views/filament/widgets/group.blade.php b/Resources/views/filament/widgets/group.blade.php
index bb1973e7..52954166 100755
--- a/Resources/views/filament/widgets/group.blade.php
+++ b/Resources/views/filament/widgets/group.blade.php
@@ -2,10 +2,17 @@
     <x-filament::section collapsible
         icon="{{ $icon }}"
         >
+<<<<<<< HEAD
         <x-slot name="description">
             {{ $title }}
         </x-slot>
         @if (count($widgets)==1)
+=======
+        <x-slot name="heading">
+            {{ $title }}
+        </x-slot>
+        @if(count($widgets)==1)
+>>>>>>> up
             @livewire($widgets[0]['class'], $widgets[0]['properties'])
         @endif