diff --git a/internal/storage/merge.go b/internal/storage/merge.go
index d979b53f..7987719f 100644
--- a/internal/storage/merge.go
+++ b/internal/storage/merge.go
@@ -8,8 +8,8 @@ import (
 	"github.com/qdm12/gluetun/internal/models"
 )
 
-func (s *storage) logVersionDiff(provider string, diff uint16) {
-	diffString := strconv.Itoa(int(diff))
+func (s *storage) logVersionDiff(provider string, diff int) {
+	diffString := strconv.Itoa(diff)
 
 	message := provider + " servers from file discarded because they are " +
 		diffString + " version"
@@ -58,7 +58,7 @@ func (s *storage) mergeCyberghost(hardcoded, persisted models.CyberghostServers)
 		return hardcoded
 	}
 
-	versionDiff := hardcoded.Version - persisted.Version
+	versionDiff := int(hardcoded.Version) - int(persisted.Version)
 	if versionDiff > 0 {
 		s.logVersionDiff("Cyberghost", versionDiff)
 		return hardcoded
@@ -72,7 +72,7 @@ func (s *storage) mergeFastestvpn(hardcoded, persisted models.FastestvpnServers)
 	if persisted.Timestamp <= hardcoded.Timestamp {
 		return hardcoded
 	}
-	versionDiff := hardcoded.Version - persisted.Version
+	versionDiff := int(hardcoded.Version) - int(persisted.Version)
 	if versionDiff > 0 {
 		s.logVersionDiff("FastestVPN", versionDiff)
 		return hardcoded
@@ -85,7 +85,7 @@ func (s *storage) mergeHideMyAss(hardcoded, persisted models.HideMyAssServers) m
 	if persisted.Timestamp <= hardcoded.Timestamp {
 		return hardcoded
 	}
-	versionDiff := hardcoded.Version - persisted.Version
+	versionDiff := int(hardcoded.Version) - int(persisted.Version)
 	if versionDiff > 0 {
 		s.logVersionDiff("HideMyAss", versionDiff)
 		return hardcoded
@@ -98,7 +98,7 @@ func (s *storage) mergeIpvanish(hardcoded, persisted models.IpvanishServers) mod
 	if persisted.Timestamp <= hardcoded.Timestamp {
 		return hardcoded
 	}
-	versionDiff := hardcoded.Version - persisted.Version
+	versionDiff := int(hardcoded.Version) - int(persisted.Version)
 	if versionDiff > 0 {
 		s.logVersionDiff("Ipvanish", versionDiff)
 		return hardcoded
@@ -111,7 +111,7 @@ func (s *storage) mergeIvpn(hardcoded, persisted models.IvpnServers) models.Ivpn
 	if persisted.Timestamp <= hardcoded.Timestamp {
 		return hardcoded
 	}
-	versionDiff := hardcoded.Version - persisted.Version
+	versionDiff := int(hardcoded.Version) - int(persisted.Version)
 	if versionDiff > 0 {
 		s.logVersionDiff("Ivpn", versionDiff)
 		return hardcoded
@@ -125,7 +125,7 @@ func (s *storage) mergeMullvad(hardcoded, persisted models.MullvadServers) model
 		return hardcoded
 	}
 
-	versionDiff := hardcoded.Version - persisted.Version
+	versionDiff := int(hardcoded.Version) - int(persisted.Version)
 	if versionDiff > 0 {
 		s.logVersionDiff("Mullvad", versionDiff)
 		return hardcoded
@@ -140,7 +140,7 @@ func (s *storage) mergeNordVPN(hardcoded, persisted models.NordvpnServers) model
 		return hardcoded
 	}
 
-	versionDiff := hardcoded.Version - persisted.Version
+	versionDiff := int(hardcoded.Version) - int(persisted.Version)
 	if versionDiff > 0 {
 		s.logVersionDiff("NordVPN", versionDiff)
 		return hardcoded
@@ -154,7 +154,7 @@ func (s *storage) mergePrivado(hardcoded, persisted models.PrivadoServers) model
 	if persisted.Timestamp <= hardcoded.Timestamp {
 		return hardcoded
 	}
-	versionDiff := hardcoded.Version - persisted.Version
+	versionDiff := int(hardcoded.Version) - int(persisted.Version)
 	if versionDiff > 0 {
 		s.logVersionDiff("Privado", versionDiff)
 		return hardcoded
@@ -168,7 +168,7 @@ func (s *storage) mergePIA(hardcoded, persisted models.PiaServers) models.PiaSer
 	if persisted.Timestamp <= hardcoded.Timestamp {
 		return hardcoded
 	}
-	versionDiff := hardcoded.Version - persisted.Version
+	versionDiff := int(hardcoded.Version) - int(persisted.Version)
 	if versionDiff > 0 {
 		s.logVersionDiff("Private Internet Access", versionDiff)
 		return hardcoded
@@ -182,7 +182,7 @@ func (s *storage) mergePrivatevpn(hardcoded, persisted models.PrivatevpnServers)
 	if persisted.Timestamp <= hardcoded.Timestamp {
 		return hardcoded
 	}
-	versionDiff := hardcoded.Version - persisted.Version
+	versionDiff := int(hardcoded.Version) - int(persisted.Version)
 	if versionDiff > 0 {
 		s.logVersionDiff("PrivateVPN", versionDiff)
 		return hardcoded
@@ -196,7 +196,7 @@ func (s *storage) mergeProtonvpn(hardcoded, persisted models.ProtonvpnServers) m
 	if persisted.Timestamp <= hardcoded.Timestamp {
 		return hardcoded
 	}
-	versionDiff := hardcoded.Version - persisted.Version
+	versionDiff := int(hardcoded.Version) - int(persisted.Version)
 	if versionDiff > 0 {
 		s.logVersionDiff("ProtonVPN", versionDiff)
 		return hardcoded
@@ -211,7 +211,7 @@ func (s *storage) mergePureVPN(hardcoded, persisted models.PurevpnServers) model
 		return hardcoded
 	}
 
-	versionDiff := hardcoded.Version - persisted.Version
+	versionDiff := int(hardcoded.Version) - int(persisted.Version)
 	if versionDiff > 0 {
 		s.logVersionDiff("PureVPN", versionDiff)
 		return hardcoded
@@ -226,7 +226,7 @@ func (s *storage) mergeSurfshark(hardcoded, persisted models.SurfsharkServers) m
 		return hardcoded
 	}
 
-	versionDiff := hardcoded.Version - persisted.Version
+	versionDiff := int(hardcoded.Version) - int(persisted.Version)
 	if versionDiff > 0 {
 		s.logVersionDiff("Surfshark", versionDiff)
 		return hardcoded
@@ -240,7 +240,7 @@ func (s *storage) mergeTorguard(hardcoded, persisted models.TorguardServers) mod
 	if persisted.Timestamp <= hardcoded.Timestamp {
 		return hardcoded
 	}
-	versionDiff := hardcoded.Version - persisted.Version
+	versionDiff := int(hardcoded.Version) - int(persisted.Version)
 	if versionDiff > 0 {
 		s.logVersionDiff("Torguard", versionDiff)
 		return hardcoded
@@ -254,7 +254,7 @@ func (s *storage) mergeVPNUnlimited(hardcoded, persisted models.VPNUnlimitedServ
 	if persisted.Timestamp <= hardcoded.Timestamp {
 		return hardcoded
 	}
-	versionDiff := hardcoded.Version - persisted.Version
+	versionDiff := int(hardcoded.Version) - int(persisted.Version)
 	if versionDiff > 0 {
 		s.logVersionDiff(constants.VPNUnlimited, versionDiff)
 		return hardcoded
@@ -269,7 +269,7 @@ func (s *storage) mergeVyprvpn(hardcoded, persisted models.VyprvpnServers) model
 		return hardcoded
 	}
 
-	versionDiff := hardcoded.Version - persisted.Version
+	versionDiff := int(hardcoded.Version) - int(persisted.Version)
 	if versionDiff > 0 {
 		s.logVersionDiff("VyprVPN", versionDiff)
 		return hardcoded
@@ -283,7 +283,8 @@ func (s *storage) mergeWindscribe(hardcoded, persisted models.WindscribeServers)
 	if persisted.Timestamp <= hardcoded.Timestamp {
 		return hardcoded
 	}
-	versionDiff := hardcoded.Version - persisted.Version
+
+	versionDiff := int(hardcoded.Version) - int(persisted.Version)
 	if versionDiff > 0 {
 		s.logVersionDiff("Windscribe", versionDiff)
 		return hardcoded