diff --git a/src/posts/ada-lovelace.md b/src/posts/ada-lovelace.md
index 4d44c1f..50508e6 100644
--- a/src/posts/ada-lovelace.md
+++ b/src/posts/ada-lovelace.md
@@ -1,8 +1,11 @@
 ---
 title: 'Ada Lovelace, la codeuse de l’ombre'
 date: '2023-02-02'
+<<<<<<< HEAD
 eventDate: '2023-01-03'
 eventTime: '14:00'
+=======
+>>>>>>> cd6ea738f4640fa7403653199b2df54addbe2db6
 author: 'Lucie Margaria'
 type: 'news'
 illustration: '/images/posts/ada-lovelace.svg'