Fix merge conflicts

CHANGELOG.md

@@ -5,6 +5,7 @@
     Bug #2311: Targeted scripts are not properly supported on non-unique RefIDs
     Bug #3676: NiParticleColorModifier isn't applied properly
     Bug #4774: Guards are ignorant of an invisible player that tries to attack them
+    Bug #5108: Savegame bloating due to inefficient fog textures format
     Bug #5358: ForceGreeting always resets the dialogue window completely
     Bug #5363: Enchantment autocalc not always 0/1
     Bug #5364: Script fails/stops if trying to startscript an unknown script
@@ -170,7 +171,6 @@
     Bug #5103: Sneaking state behavior is still inconsistent
     Bug #5104: Black Dart's enchantment doesn't trigger at low Enchant levels
     Bug #5106: Still can jump even when encumbered
-    Bug #5108: Savegame bloating due to inefficient fog textures format
     Bug #5110: ModRegion with a redundant numerical argument breaks script execution
     Bug #5112: Insufficient magicka for current spell not reflected on HUD icon
     Bug #5113: Unknown alchemy question mark not centered

components/esm/fogstate.cpp

@@ -69,7 +69,7 @@ void ESM::FogState::load (ESMReader &esm)
         tex.mImageData.resize(imageSize);
         esm.getExact(&tex.mImageData[0], imageSize);
 
-        if (dataFormat < 6)
+        if (dataFormat < 7)
             convertFogOfWar(tex.mImageData);
 
         mFogTextures.push_back(tex);

components/esm/savedgame.cpp

@@ -5,7 +5,7 @@
 #include "defs.hpp"
 
 unsigned int ESM::SavedGame::sRecordId = ESM::REC_SAVE;
-int ESM::SavedGame::sCurrentFormat = 6;
+int ESM::SavedGame::sCurrentFormat = 7;
 
 void ESM::SavedGame::load (ESMReader &esm)
 {