Addressing conflicts

internal/pkg/agent/install/install.go

@@ -28,19 +28,6 @@ func Install(cfgFile, topPath string) error {
 		return errors.New(err, "failed to discover the source directory for installation", errors.TypeFilesystem)
 	}
 
-<<<<<<< HEAD
-	// Uninstall current installation
-	//
-	// There is no uninstall token for "install" command.
-	// Uninstall will fail on protected agent.
-	// The protected Agent will need to be uninstalled first before it can be installed.
-	err = Uninstall(cfgFile, topPath, "")
-	if err != nil {
-		return errors.New(
-			err,
-			fmt.Sprintf("failed to uninstall Agent at (%s)", filepath.Dir(topPath)),
-			errors.M("directory", filepath.Dir(topPath)))
-=======
 	// We only uninstall Agent if it is currently installed.
 	status, _ := Status(topPath)
 	if status == Installed {
@@ -49,17 +36,13 @@ func Install(cfgFile, topPath string) error {
 		// There is no uninstall token for "install" command.
 		// Uninstall will fail on protected agent.
 		// The protected Agent will need to be uninstalled first before it can be installed.
-		s := pt.StepStart("Uninstalling current Elastic Agent")
-		err = Uninstall(cfgFile, topPath, "", s)
+		err = Uninstall(cfgFile, topPath, "")
 		if err != nil {
-			s.Failed()
 			return errors.New(
 				err,
 				fmt.Sprintf("failed to uninstall Agent at (%s)", filepath.Dir(topPath)),
 				errors.M("directory", filepath.Dir(topPath)))
 		}
-		s.Succeeded()
->>>>>>> 0c43005695 (`elastic-agent install`: Only uninstall when Agent is installed (#3415))
 	}
 
 	// ensure parent directory exists, copy source into install path
@@ -70,12 +53,6 @@ func Install(cfgFile, topPath string) error {
 			fmt.Sprintf("failed to create installation parent directory (%s)", filepath.Dir(topPath)),
 			errors.M("directory", filepath.Dir(topPath)))
 	}
-<<<<<<< HEAD
-=======
-
-	// copy source into install path
-	s := pt.StepStart("Copying files")
->>>>>>> 0c43005695 (`elastic-agent install`: Only uninstall when Agent is installed (#3415))
 	err = copy.Copy(dir, topPath, copy.Options{
 		OnSymlink: func(_ string) copy.SymlinkAction {
 			return copy.Shallow