diff --git a/cmd/helm/install.go b/cmd/helm/install.go
index 27daa710f..300d23e87 100644
--- a/cmd/helm/install.go
+++ b/cmd/helm/install.go
@@ -17,13 +17,11 @@ limitations under the License.
 package main
 
 import (
+	"fmt"
 	"io"
-<<<<<<< HEAD
 	"io/ioutil"
-	"strings"
-=======
 	"log"
->>>>>>> feat(comp): Provide completion for --version flag
+	"strings"
 	"time"
 
 	"github.com/pkg/errors"