diff --git a/42sh/Makefile b/42sh/Makefile
index ae67e26f..eb5de9c9 100644
--- a/42sh/Makefile
+++ b/42sh/Makefile
@@ -6,11 +6,7 @@
 #    By: wescande <wescande@student.42.fr>          +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2016/08/29 21:32:58 by wescande          #+#    #+#              #
-<<<<<<< HEAD
-#    Updated: 2017/03/03 14:36:32 by ariard           ###   ########.fr        #
-=======
-#    Updated: 2017/03/02 16:23:48 by jhalford         ###   ########.fr        #
->>>>>>> pda_execution
+#    Updated: 2017/03/03 18:00:59 by wescande         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #