Fixed merge conflict

.gitignore

@@ -6,6 +6,7 @@
 # Folders
 _obj
 _test
+.idea
 
 # Architecture specific extensions/prefixes
 *.[568vq]

run.go

@@ -20,6 +20,7 @@ import (
 	path "path/filepath"
 	"runtime"
 	"strings"
+	"fmt"
 )
 
 var cmdRun = &Command{
@@ -32,18 +33,23 @@ it will recompile and restart the app after any modifications.
 `,
 }
 
-var mainFiles ListOpts
-
-var downdoc docValue
-var gendoc docValue
-
+var (
+	mainFiles ListOpts
+	downdoc docValue
+	gendoc docValue
 	// The flags list of the paths excluded from watching
-var excludedPaths strFlags
-
+	excludedPaths strFlags
 	// Pass through to -tags arg of "go build"
-var buildTags string
-
-var vendorWatch bool
+	buildTags string
+	// Application path
+	currpath string
+	// Application name
+	appname string
+	// Channel to signal an Exit
+	exit chan bool
+	// Flag to watch the vendor folder
+	vendorWatch bool
+)
 
 func init() {
 	cmdRun.Run = runApp
@@ -53,13 +59,8 @@ func init() {
 	cmdRun.Flag.Var(&excludedPaths, "e", "Excluded paths[].")
 	cmdRun.Flag.BoolVar(&vendorWatch, "vendor", false, "Watch vendor folder")
 	cmdRun.Flag.StringVar(&buildTags, "tags", "", "Build tags (https://golang.org/pkg/go/build/)")
-}
-
-var (
-	currpath 	= ""
-	appname		= ""
 	exit = make(chan bool)
-)
+}
 
 func runApp(cmd *Command, args []string) int {
 	ShowShortVersionBanner()