diff --git a/tfexec/errors.go b/tfexec/errors.go
index 26e38ed0..82c6e0a9 100644
--- a/tfexec/errors.go
+++ b/tfexec/errors.go
@@ -28,10 +28,15 @@ var (
 	tfVersionMismatchConstraintRegexp = regexp.MustCompile(`required_version = "(.+)"|Required version: (.+)\b`)
 )
 
+<<<<<<< HEAD
 func (tf *Terraform) parseError(err error, stderr string) error {
 	// if not an ExitError, just return it, do not try to parse
 	var ee *exec.ExitError
 	if !errors.As(err, &ee) {
+=======
+func parseError(err error, stderr string) error {
+	if _, ok := err.(*exec.ExitError); !ok {
+>>>>>>> Update tfexec/errors.go
 		return err
 	}