fix merge conflict issue

cli/cmd/deploy/deploy.go

@@ -167,7 +167,6 @@ func (d *DeployAgent) GetBuildEnv(opts *GetBuildEnvOpts) (map[string]string, err
 		return nil, err
 	}
 
-<<<<<<< nafees/hotfixes
 	envConfig, err := GetNestedMap(conf, "container", "env")
 
 	if err == nil {
@@ -181,15 +180,6 @@ func (d *DeployAgent) GetBuildEnv(opts *GetBuildEnvOpts) (map[string]string, err
 					if valStr, ok := val.(string); ok {
 						env[key] = valStr
 					}
-=======
-	if opts.IncludeBuildEnv {
-		buildEnv, err := GetNestedMap(conf, "container", "env", "build")
-
-		if err == nil {
-			for key, val := range buildEnv {
-				if valStr, ok := val.(string); ok {
-					env[key] = valStr
->>>>>>> master
 				}
 			}
 		}