fix stupid gitea stuff

protocols/kia_v5.c

@@ -277,8 +277,11 @@ const SubGhzProtocol kia_protocol_v5 = {
 #define KIA_V5_TOTAL_BURSTS       3
 #define KIA_V5_INTER_BURST_GAP_US 10000
 
+<<<<<<< Updated upstream
 // Static state — persists across encoder alloc/free cycles
 // for the lifetime of the app session
+=======
+>>>>>>> Stashed changes
 static uint16_t kia_v5_last_counter = 0;
 static bool kia_v5_counter_loaded = false;
 static bool kia_v5_tx_done = false;
@@ -442,7 +445,10 @@ SubGhzProtocolStatus
     instance->encoder.repeat = 1;
 
     do {
+<<<<<<< Updated upstream
         // Maybe loop happening here?
+=======
+>>>>>>> Stashed changes
         if(kia_v5_tx_done) {
             KV5_LOG("TX already completed, blocking re-deserialize");
             break;
@@ -519,6 +525,10 @@ SubGhzProtocolStatus
 
         KV5_LOG("Parsed key: %08lX%08lX", (uint32_t)(key >> 32), (uint32_t)(key & 0xFFFFFFFF));
 
+<<<<<<< Updated upstream
+=======
+        // Read serial (always from file — serial doesn't change)
+>>>>>>> Stashed changes
         if(!flipper_format_read_uint32(flipper_format, "Serial", &instance->serial, 1)) {
             uint64_t yek = bit_reverse_64(key);
             instance->serial = (uint32_t)((yek >> 32) & 0x0FFFFFFF);
@@ -528,6 +538,10 @@ SubGhzProtocolStatus
         }
         instance->generic.serial = instance->serial;
 
+<<<<<<< Updated upstream
+=======
+        // Read button (always from file — button doesn't change)
+>>>>>>> Stashed changes
         uint32_t btn_temp;
         if(flipper_format_read_uint32(flipper_format, "Btn", &btn_temp, 1)) {
             instance->button = (uint8_t)btn_temp;