diff --git a/README.md b/README.md
index bccc3c8..c65fcf1 100755
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # ag_gen: Attack Graph Generation System
 
 ## Installation