diff --git a/parse_input.c b/parse_input.c
index 2e6352f..9dbda39 100644
--- a/parse_input.c
+++ b/parse_input.c
@@ -6,11 +6,8 @@
 /*   By: vmanzoni <vmanzoni@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/15 14:48:14 by vmanzoni          #+#    #+#             */
-<<<<<<< HEAD
 /*   Updated: 2019/04/18 16:09:24 by vmanzoni         ###   ########.fr       */
-=======
 /*   Updated: 2019/04/19 12:53:40 by hulamy           ###   ########.fr       */
->>>>>>> master
 /*                                                                            */
 /* ************************************************************************** */