diff --git a/minishell b/minishell
index 1ef52b8..cc8701a 100755
Binary files a/minishell and b/minishell differ
diff --git a/srcs/execution/ft_execution.c b/srcs/execution/ft_execution.c
index 0a1e127..a15b403 100644
--- a/srcs/execution/ft_execution.c
+++ b/srcs/execution/ft_execution.c
@@ -1,11 +1,28 @@
 
 #include "../../includes/minishell.h"
 
+<<<<<<< HEAD
+void	is_builtin(t_prg data, t_cmd_lst *node)
+=======
 void	is_builtin(t_prg *data, t_cmd_lst *node)
+>>>>>>> 062fef404de5f7b3805a1b187272e7daca4e289b
 {
 	if (node->is_cmd_builtin)
 	{
 		if (node->is_cmd_builtin == echo)
+<<<<<<< HEAD
+			_echo_exe(&data, 0);
+		if (node->is_cmd_builtin == cd)
+			_ch_dir(&data);
+		if (node->is_cmd_builtin == pwd)
+			_pwd_exe();
+		if (node->is_cmd_builtin == export)
+			_export_env(&data);
+		if (node->is_cmd_builtin == unset)
+			_unset_env_parent(&data);
+		if (node->is_cmd_builtin == env)
+			_print_env(data.env_lst);
+=======
 			_echo_exe(data, 0);
 		if (node->is_cmd_builtin == cd)
 			_ch_dir(data);
@@ -17,6 +34,7 @@ void	is_builtin(t_prg *data, t_cmd_lst *node)
 			_unset_env_parent(data);
 		if (node->is_cmd_builtin == env)
 			_print_env(data->env_lst);
+>>>>>>> 062fef404de5f7b3805a1b187272e7daca4e289b
 		if (node->is_cmd_builtin == quit)
 			exit(0);
 		exit(0);