diff --git a/app/Models/Movimenti.php b/app/Models/Movimenti.php
index 60bb390..fdf2105 100644
--- a/app/Models/Movimenti.php
+++ b/app/Models/Movimenti.php
@@ -193,11 +193,7 @@ JOIN categories as c ON a.mov_fk_categoria=c.id';
                 list($giorno,$mese,$anno) = explode('/',$line['Data valuta']);
                 $data="$anno-$mese-$giorno";
                 self::insEntrata([
-<<<<<<< HEAD
-                    'mov_data'=>$data,
-=======
                     'mov_data'=>self::dateFormat(0,$line['Data valuta']),
->>>>>>> devel
                     'mov_fk_categoria'=>1,
                     'mov_descrizione'=>$line['Descrizione operazione'],
                     'mov_importo'=>trim(str_replace(',','.',(str_replace('.','',str_replace('€', '', $line['Importo']))))),
diff --git a/resources/views/layouts/dashboard.blade.php b/resources/views/layouts/dashboard.blade.php
index 70bea40..9af155a 100644
--- a/resources/views/layouts/dashboard.blade.php
+++ b/resources/views/layouts/dashboard.blade.php
@@ -12,7 +12,7 @@
 @section('content')
 
 <div class="row">
-@hasanyrole('user|admin')
+@can('conti')
 
     <div class="col-lg-3 col-md-8 draggable">
         <div class="info-box bg-success">
@@ -69,7 +69,7 @@
             </div>
         </div>
     </div>
-	@endhasanyrole
+	@endcan
 </div>
 
 @can('tasks')