diff --git a/README.md b/README.md
index 4e4ed7d241c1cdd5618dbc7978a9585008aeb568..f293043bb0319f2737e631aaf9bc873fcc8e53a5 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,6 @@
 HeLaZ (Hermite-Laguerre Z-pinch solver, 2020)
 
-<<<<<<< HEAD
 {demo_phi_00.gif, layout=left, float, size=full, alt="a duckling"}
-=======
-![] (demo_phi_00.gif)
->>>>>>> c771f993830de3832803cd5cc3b5eda2f3e46d43
 
 Roadmap : (Current version 1.4)