diff --git a/include/main.h b/include/main.h
index e2622b4..cfab1bf 100644
--- a/include/main.h
+++ b/include/main.h
@@ -22,7 +22,7 @@
 #define CLUSTER "grappe1"
 #define SENSORS_NUMBER 5
 #define DHT22 22
-#define TIME_TO_SLEEP 598
+#define TIME_TO_SLEEP 3600 // l'ESp32 est rallumé à plein régime pour prendre une mesure toutes les 3600 secondes (soit 1 fois/heure)
 #define US_TO_S_FACTOR 1000000 //1000000 => 1 mesure par 10 min
 #define R2 100
 #define R3 10
diff --git a/src/main.cpp b/src/main.cpp
index 7ea843a..91078f9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,7 +5,11 @@
 
 using namespace std;
 
+<<<<<<< HEAD
 DHT sensors[SENSORS_NUMBER] = {DHT(4, DHT22), DHT(5, DHT22), DHT(18, DHT22), DHT(19, DHT22), DHT(21, DHT22)};
+=======
+DHT sensors[SENSORS_NUMBER] = {DHT(23, DHT22), DHT(22, DHT22), DHT(21, DHT22), DHT(17, DHT22), DHT(35, DHT22)};
+>>>>>>> e1180bef4e914976c20b61b18ae28328e17ae2af
 float temp[SENSORS_NUMBER];
 float hum[SENSORS_NUMBER];