diff --git a/builtins/.echo.c.swp b/builtins/.echo.c.swp
new file mode 100644
index 0000000..89a016f
Binary files /dev/null and b/builtins/.echo.c.swp differ
diff --git a/builtins/echo.c b/builtins/echo.c
index 2e21e52..2c3bff4 100644
--- a/builtins/echo.c
+++ b/builtins/echo.c
@@ -6,19 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/17 13:09:08 by erey-bet          #+#    #+#             */
-<<<<<<< HEAD
-<<<<<<< HEAD
-/*   Updated: 2023/02/21 22:24:51 by erey-bet         ###   ########.fr       */
-=======
-<<<<<<< HEAD
-/*   Updated: 2023/02/21 21:45:38 by cchauvet         ###   ########.fr       */
-=======
-/*   Updated: 2023/02/21 22:09:55 by erey-bet         ###   ########.fr       */
->>>>>>> 1fdc51a668e616de94c33d5b3b1e9cb51182916d
->>>>>>> eb4a8ed663b2f93cd955f7608aa686bd8e767a65
-=======
-/*   Updated: 2023/02/21 22:15:27 by cchauvet         ###   ########.fr       */
->>>>>>> 76bc8fbfd8d5413e8f6e4f3eb6ec00db0fa3c884
+/*   Updated: 2023/02/21 23:31:04 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */