diff --git a/include/minishell.h b/include/minishell.h
index 2b73e61..367e3b1 100644
--- a/include/minishell.h
+++ b/include/minishell.h
@@ -6,11 +6,8 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/26 09:38:51 by mmoussou          #+#    #+#             */
-<<<<<<< HEAD
 /*   Updated: 2024/05/06 20:30:42 by mmoussou         ###   ########.fr       */
-=======
 /*   Updated: 2024/05/03 10:24:15 by adjoly           ###   ########.fr       */
->>>>>>> e1ba625 (「🏗️」 wip: testing things, might broke.)
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/include/minishell.h.orig b/include/minishell.h.orig
deleted file mode 100644
index 2b73e61..0000000
--- a/include/minishell.h.orig
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   minishell.h                                        :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2024/04/26 09:38:51 by mmoussou          #+#    #+#             */
-<<<<<<< HEAD
-/*   Updated: 2024/05/06 20:30:42 by mmoussou         ###   ########.fr       */
-=======
-/*   Updated: 2024/05/03 10:24:15 by adjoly           ###   ########.fr       */
->>>>>>> e1ba625 (「🏗️」 wip: testing things, might broke.)
-/*                                                                            */
-/* ************************************************************************** */
-
-#ifndef MINISHELL_H
-# define MINISHELL_H
-
-# include <readline/readline.h>
-# include <stdio.h>
-# include <stdlib.h>
-# include <stdint.h>
-# include "libft.h"
-
-# include "parsing.h"
-# include "execution.h"
-
-char	set_env(char **env, const char *name, char *content);
-char	*get_hostname(void);
-char	*get_prompt(void);
-char	*get_pwd(void);
-bool	is_str(char *src, char *dst);
-
-#endif
diff --git a/obj/src/env/env_list/ft_envadd_back.o b/obj/src/env/env_list/ft_envadd_back.o
new file mode 100644
index 0000000..2ae2e1a
Binary files /dev/null and b/obj/src/env/env_list/ft_envadd_back.o differ
diff --git a/obj/src/env/env_list/ft_envadd_front.o b/obj/src/env/env_list/ft_envadd_front.o
new file mode 100644
index 0000000..a378d4e
Binary files /dev/null and b/obj/src/env/env_list/ft_envadd_front.o differ
diff --git a/obj/src/env/env_list/ft_envclear.o b/obj/src/env/env_list/ft_envclear.o
new file mode 100644
index 0000000..7c197f3
Binary files /dev/null and b/obj/src/env/env_list/ft_envclear.o differ
diff --git a/obj/src/env/env_list/ft_envdelone.o b/obj/src/env/env_list/ft_envdelone.o
new file mode 100644
index 0000000..880ea69
Binary files /dev/null and b/obj/src/env/env_list/ft_envdelone.o differ
diff --git a/obj/src/env/env_list/ft_envlast.o b/obj/src/env/env_list/ft_envlast.o
new file mode 100644
index 0000000..3720bc8
Binary files /dev/null and b/obj/src/env/env_list/ft_envlast.o differ
diff --git a/obj/src/env/env_list/ft_envnew.o b/obj/src/env/env_list/ft_envnew.o
new file mode 100644
index 0000000..4549dec
Binary files /dev/null and b/obj/src/env/env_list/ft_envnew.o differ
diff --git a/obj/src/env/env_list/ft_envsize.o b/obj/src/env/env_list/ft_envsize.o
new file mode 100644
index 0000000..9bc43f8
Binary files /dev/null and b/obj/src/env/env_list/ft_envsize.o differ
diff --git a/obj/src/is_str.o b/obj/src/is_str.o
new file mode 100644
index 0000000..72c86d3
Binary files /dev/null and b/obj/src/is_str.o differ
diff --git a/obj/src/main.o b/obj/src/main.o
new file mode 100644
index 0000000..5d3abbc
Binary files /dev/null and b/obj/src/main.o differ
diff --git a/obj/src/parsing/split_cmd.o b/obj/src/parsing/split_cmd.o
new file mode 100644
index 0000000..69892b0
Binary files /dev/null and b/obj/src/parsing/split_cmd.o differ
diff --git a/obj/src/prompt/get_hostname.o b/obj/src/prompt/get_hostname.o
new file mode 100644
index 0000000..63cf904
Binary files /dev/null and b/obj/src/prompt/get_hostname.o differ
diff --git a/obj/src/prompt/get_prompt.o b/obj/src/prompt/get_prompt.o
new file mode 100644
index 0000000..38af03c
Binary files /dev/null and b/obj/src/prompt/get_prompt.o differ
diff --git a/obj/src/prompt/get_pwd.o b/obj/src/prompt/get_pwd.o
new file mode 100644
index 0000000..8384267
Binary files /dev/null and b/obj/src/prompt/get_pwd.o differ