diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 3e92ed502..447904e21 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -368,7 +368,7 @@ int OpenTxInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t varian
         version = 216;
         break;
       case BOARD_9XRPRO:
-        version = 215;
+        version = 216;
         break;
       case BOARD_GRUVIN9X:
         version = 216;
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 473d9a7b3..ac7a11211 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -4531,15 +4531,10 @@ void opentxClose()
   hapticOff();
 #endif
 
-<<<<<<< HEAD
-#if defined(CPUARM) && defined(FRSKY)
-  if((g_model.frsky.mAhPersistent) && (g_model.frsky.storedMah != frskyData.hub.currentConsumption)) {
-=======
   saveTimers();
 
 #if defined(CPUARM) && defined(FRSKY)
   if ((g_model.frsky.mAhPersistent) && (g_model.frsky.storedMah != frskyData.hub.currentConsumption)) {
->>>>>>> origin/next
     g_model.frsky.storedMah = frskyData.hub.currentConsumption;
     eeDirty(EE_MODEL);
   }