diff --git a/_blog.yml b/_blog.yml
index abd5740757..72aa000322 100644
--- a/_blog.yml
+++ b/_blog.yml
@@ -3767,8 +3767,6 @@
     - multimodal
     - guide
     - trl
-<<<<<<< HEAD
-<<<<<<< HEAD
 
 - local: idefics2
   title: "Introducing Idefics2: A Powerful 8B Vision-Language Model for the community"
@@ -3781,36 +3779,15 @@
     - cv
     - vlm
     - multimodal
-=======
-=======
-=======
-- local: concrete-ml-inference-on-endpoints-fhe
-  title: "Running Privacy-Preserving Inferences on Hugging Face EndPoints"
-=======
-=======
-=======
->>>>>>> 6f1a23a (merge)
 
 - local: fhe-endpoints
   title: "Running Privacy-Preserving Inference on Hugging Face Endpoints"
   author: binoua
   guest: true
   thumbnail: /blog/assets/fhe-endpoints/thumbnail.png
-  date: April 16, 2024
+  date: April 17, 2024
   tags:
     - guide
     - privacy
     - research
     - FHE
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> 0fe12cc (Add a blog about how to use HF endpoints to run Concrete-ML privacy-preserving ML models.)
->>>>>>> 149835e (Add a blog about how to use HF endpoints to run Concrete-ML privacy-preserving ML models.)
-<<<<<<< HEAD
->>>>>>> 5fdbe36 (Add a blog about how to use HF endpoints to run Concrete-ML privacy-preserving ML models.)
-=======
-=======
->>>>>>> 077d776 (merge)
->>>>>>> 7eae955 (merge)
-=======
->>>>>>> 6f1a23a (merge)