diff --git a/Makefile b/Makefile
index 76e58c7e..68ce5f93 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 HELM_HOME ?= $(shell helm home)
 VERSION := $(shell sed -n -e 's/version:[ "]*\([^"]*\).*/\1/p' plugin.yaml)
 
-HELM_3_PLUGINS := $(shell bash -c 'eval $$(helm env); echo $$HELM_PLUGINS')
+HELM_3_PLUGINS := $(shell helm env HELM_PLUGINS)
 
 PKG:= github.com/databus23/helm-diff/v3
 LDFLAGS := -X $(PKG)/cmd.Version=$(VERSION)
diff --git a/cmd/upgrade.go b/cmd/upgrade.go
index f730c51a..076bba48 100644
--- a/cmd/upgrade.go
+++ b/cmd/upgrade.go
@@ -261,7 +261,7 @@ func (d *diffCmd) runHelm3() error {
 
 	currentSpecs := make(map[string]*manifest.MappingResult)
 	if !newInstall && !d.dryRun {
-		if !d.noHooks {
+		if !d.noHooks && !d.threeWayMerge {
 			hooks, err := getHooks(d.release, d.namespace)
 			if err != nil {
 				return err