diff --git a/builder/vmware/iso/builder.go b/builder/vmware/iso/builder.go
index 236bd454b..c9cd16bce 100644
--- a/builder/vmware/iso/builder.go
+++ b/builder/vmware/iso/builder.go
@@ -229,7 +229,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
 }
 
 func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packer.Artifact, error) {
-	driver, err := NewDriver(&b.config)
+	driver, err := vmwcommon.NewDriver(&b.config.DriverConfig, &b.config.SSHConfig, &b.config.CommConfig, b.config.VMName)
 	if err != nil {
 		return nil, fmt.Errorf("Failed creating VMware driver: %s", err)
 	}
diff --git a/builder/vmware/iso/driver.go b/builder/vmware/iso/driver.go
deleted file mode 100644
index 947ff4c16..000000000
--- a/builder/vmware/iso/driver.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package iso
-
-import (
-	"fmt"
-
-	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
-)
-
-// NewDriver returns a new driver implementation for this operating
-// system, or an error if the driver couldn't be initialized.
-func NewDriver(config *Config) (vmwcommon.Driver, error) {
-	return vmwcommon.NewDriver(&config.DriverConfig, &config.SSHConfig, &config.CommConfig, config.VMName)
-}
diff --git a/website/source/docs/builders/vmware-vmx.html.md.erb b/website/source/docs/builders/vmware-vmx.html.md.erb
index 31f4a7627..55b56f89f 100644
--- a/website/source/docs/builders/vmware-vmx.html.md.erb
+++ b/website/source/docs/builders/vmware-vmx.html.md.erb
@@ -303,7 +303,6 @@ contention. You can tune this delay on a per-builder basis by specifying
 In addition to the special keys, each command to type is treated as a
 [configuration template](/docs/templates/configuration-templates.html). The
 available variables are:
->>>>>>> Update the vmware-vmx documentation.:website/source/docs/builders/vmware-vmx.html.md
 
 <%= partial "partials/builders/boot-command" %>