diff --git a/src/sprites/create_sprite.c b/src/sprites/create_sprite.c
index a9aabff..4e683bf 100644
--- a/src/sprites/create_sprite.c
+++ b/src/sprites/create_sprite.c
@@ -6,11 +6,7 @@
 /*   By: tchampio <tchampio@student.42lehavre.fr>   +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/08/12 15:43:19 by tchampio          #+#    #+#             */
-<<<<<<< HEAD
-/*   Updated: 2025/08/14 21:24:03 by tchampio         ###   ########.fr       */
-=======
-/*   Updated: 2025/08/13 14:53:38 by tchampio         ###   ########.fr       */
->>>>>>> f9c846b (dev: Added sprite types and gave 'base' sprites their types)
+/*   Updated: 2025/08/18 12:55:21 by tchampio         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */