diff --git a/src/cub3d.c b/src/cub3d.c
index f42af4a..3bce937 100644
--- a/src/cub3d.c
+++ b/src/cub3d.c
@@ -6,11 +6,7 @@
 /*   By: madumerg <madumerg@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/09/04 16:58:27 by madumerg          #+#    #+#             */
-<<<<<<< HEAD
-/*   Updated: 2024/10/05 19:18:00 by madumerg         ###   ########.fr       */
-=======
-/*   Updated: 2024/11/06 11:50:38 by adjoly           ###   ########.fr       */
->>>>>>> raycasting
+/*   Updated: 2024/11/06 12:53:52 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */