diff --git a/libftasm/includes/libft.h b/libftasm/includes/libft.h
index 91e507d6..bbebfb96 100644
--- a/libftasm/includes/libft.h
+++ b/libftasm/includes/libft.h
@@ -6,11 +6,7 @@
 /*   By: jhalford <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/11/07 13:49:04 by jhalford          #+#    #+#             */
-<<<<<<< HEAD
-/*   Updated: 2016/11/16 10:53:34 by jhalford         ###   ########.fr       */
-=======
-/*   Updated: 2016/11/14 16:31:04 by jhalford         ###   ########.fr       */
->>>>>>> a3f7d30e3fc482af179207682b48ae052d422bdf
+/*   Updated: 2016/11/16 10:58:19 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/libftasm/src/ft_printf/ft_printf.c b/libftasm/src/ft_printf/ft_printf.c
index 696e7a4f..d58717e0 100644
--- a/libftasm/src/ft_printf/ft_printf.c
+++ b/libftasm/src/ft_printf/ft_printf.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/11/07 13:33:27 by jhalford          #+#    #+#             */
-/*   Updated: 2016/11/16 10:57:25 by jhalford         ###   ########.fr       */
+/*   Updated: 2016/11/16 10:58:04 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */