diff --git a/VAN_01971_Transactions.csv b/VAN_01971_Transactions.csv
index 690a33b..fd3a2b2 100644
--- a/VAN_01971_Transactions.csv
+++ b/VAN_01971_Transactions.csv
@@ -1,5 +1,9 @@
 # Device, VAN_01971
+<<<<<<< HEAD
 # Generated, 8-11-2025 16:36:43
+=======
+# Generated, 02/11/2025 11:03:15
+>>>>>>> 7308aad37acbe1ea486fda282850b2c0319d506c
 txstart2: id 0x0000000000000001, socket 1, 2025-10-28 18:27:42 5518.267kWh 04BB29EAFD0F94 3 2 Y
 mv: socket 1, 2025-10-28 18:27:42 5518.267 Y
 mv: socket 1, 2025-10-28 18:27:43 5518.267 Y
@@ -925,6 +929,7 @@ mv: socket 1, 2025-11-02 08:09:16 14.000 5609258.000 50.100 0.000 0.000 23.375 N
 mv: socket 1, 2025-11-02 08:10:16 14.000 5609258.000 50.110 0.000 0.000 23.250 N
 mv: socket 1, 2025-11-02 08:10:22 5609.258 N
 txstop2: id 0xffffffffffffffff, socket 1, 2025-11-02 08:10:22 5609.258kWh 04BB29EAFD0F94 3 5 N
+<<<<<<< HEAD
 txstart2: id 0xffffffffffffffff, socket 1, 2025-11-04 16:05:14 5609.258kWh 04BB29EAFD0F94 3 2 N
 mv: socket 1, 2025-11-04 16:05:14 5609.258 N
 mv: socket 1, 2025-11-04 16:05:16 15.000 5609258.000 50.110 0.000 0.000 27.750 N
@@ -2853,3 +2858,5 @@ mv: socket 1, 2025-11-08 08:12:04 15.435 5676428.000 50.070 1802.300 0.975 24.87
 mv: socket 1, 2025-11-08 08:13:04 14.484 5676458.000 50.140 0.000 0.000 25.125 N
 mv: socket 1, 2025-11-08 08:13:49 5676.466 N
 txstop2: id 0xffffffffffffffff, socket 1, 2025-11-08 08:13:49 5676.466kWh 04BB29EAFD0F94 6 5 N
+=======
+>>>>>>> 7308aad37acbe1ea486fda282850b2c0319d506c