diff --git a/README.md b/README.md
index 609250a..2a626e3 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
 # uahgi
 
-<<<<<<< HEAD
 another experimential typesetting tool
-=======
-[![Build Status](https://github.com/yoxem/uahgi.jl/actions/workflows/CI.yml/badge.svg?branch=main)](https://github.com/yoxem/uahgi.jl/actions/workflows/CI.yml?query=branch%3Amain)
->>>>>>> b96a94c (Files generated by PkgTemplates)