resolve merge conflicts

cmd/telegraf/telegraf.go

@@ -20,7 +20,10 @@ var fVersion = flag.Bool("version", false, "display the version")
 var fSampleConfig = flag.Bool("sample-config", false, "print out full sample configuration")
 var fPidfile = flag.String("pidfile", "", "file to write our pid to")
 
+// Telegraf version
 var Version = "unreleased"
+
+// Telegraf commit
 var Commit = ""
 
 func main() {