Fixing conflicts

Author: ycombinator

internal/pkg/agent/application/upgrade/upgrade.go

@@ -179,14 +179,6 @@ func checkUpgrade(log *logger.Logger, currentVersion, newVersion agentVersion, m
 		return ErrUpgradeSameVersion
 	}
 
-<<<<<<< HEAD
-	if currentVersion.fips && metadata.manifest.Package.Fips {
-		return nil
-	}
-
-	if !currentVersion.fips && !metadata.manifest.Package.Fips {
-		return nil
-=======
 	if currentVersion.fips && !metadata.manifest.Package.Fips {
 		log.Warnf("Upgrade action skipped because FIPS-capable Agent cannot be upgraded to non-FIPS-capable Agent")
 		return ErrFipsToNonFips
@@ -195,7 +187,6 @@ func checkUpgrade(log *logger.Logger, currentVersion, newVersion agentVersion, m
 	if !currentVersion.fips && metadata.manifest.Package.Fips {
 		log.Warnf("Upgrade action skipped because non-FIPS-capable Agent cannot be upgraded to FIPS-capable Agent")
 		return ErrNonFipsToFips
->>>>>>> ac9ee9a34 ([Integration Test] Ensure that upgrading a FIPS-capable Agent results in a FIPS-capable Agent (#7804))
 	}
 
 	return ErrFipsNotUpgradedToFips

testing/upgradetest/upgrader.go

@@ -140,16 +140,6 @@ func WithCustomWatcherConfig(cfg string) UpgradeOpt {
 	}
 }
 
-<<<<<<< HEAD
-=======
-// WithServers will use start version with servers flavor.
-func WithServers() UpgradeOpt {
-	return func(opts *UpgradeOpts) {
-		opts.installServers = true
-	}
-}
-
->>>>>>> ac9ee9a34 ([Integration Test] Ensure that upgrading a FIPS-capable Agent results in a FIPS-capable Agent (#7804))
 // WithDisableUpgradeWatcherUpgradeDetailsCheck disables any assertions for
 // upgrade details that are being set by the Upgrade Watcher. This option is
 // useful in upgrade tests where the end Agent version does not contain changes