diff --git a/Fotovoltaico.py b/Fotovoltaico.py
index 9c08b19..26776a0 100644
--- a/Fotovoltaico.py
+++ b/Fotovoltaico.py
@@ -92,6 +92,7 @@ path_export_hourly = path_export.replace('.csv', '_hourly.csv')
 # Esporta il file orario
 export_hourly_pv_productivity(result_ac_energies_to_csv_df, path_export_hourly)
 
+<<<<<<< HEAD
 import pandas as pd
 import plotly.express as px