diff --git a/src/consts.h b/src/consts.h
index 7f61e8d..59fd961 100644
--- a/src/consts.h
+++ b/src/consts.h
@@ -6,11 +6,7 @@
 /*   By: kcolin <kcolin@42.fr>                      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/07/17 14:54:36 by kcolin            #+#    #+#             */
-<<<<<<< Updated upstream
-/*   Updated: 2025/07/29 11:42:20 by kcolin           ###   ########.fr       */
-=======
-/*   Updated: 2025/07/29 12:02:08 by tchampio         ###   ########.fr       */
->>>>>>> Stashed changes
+/*   Updated: 2025/07/29 13:29:11 by tchampio         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */