diff --git a/cmdEnv/envVars.go b/cmdEnv/envVars.go
index 5a81855..e287e5a 100644
--- a/cmdEnv/envVars.go
+++ b/cmdEnv/envVars.go
@@ -28,8 +28,17 @@ var EnvCmd = &cobra.Command{
 	Long:  `A simple CLI option to manage environment variables`,
 	Run: func(cmd *cobra.Command, args []string) {
 
+<<<<<<< HEAD
 		// Start Env command
 		startEnvVar(cmd, args)
+=======
+		config.SetInformations(cmd, args)
+
+		// if option --env or -e is set then print environment variables
+		if config.GetEnvVariablesFlag() {
+			printEnvVariables()
+		}
+>>>>>>> b7ba427 (corr. envVar)
 
 	},
 }
diff --git a/config/config.go b/config/config.go
index c0f2a98..94c6845 100644
--- a/config/config.go
+++ b/config/config.go
@@ -104,9 +104,24 @@ func (c *Config) SetAuthor(value string) {
 	c.author = value
 }
 
+<<<<<<< HEAD
 // Getter for modifDate field
 func (c *Config) GetModifDate() string {
 	return c.ModifDate
+=======
+func GetEnvVariablesFlag() bool {
+	return envVariablesFlag
+}
+
+func SetEnvVariablesFlag(flag bool) {
+	envVariablesFlag = flag
+}
+
+// functions for list command
+// --------------------------
+func SetListOrganisation(name string) {
+	listOrganization = name
+>>>>>>> b7ba427 (corr. envVar)
 }
 
 // Setter for modifDate field