diff --git a/README.md b/README.md
index d196908..bccc3c8 100755
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # ag_gen: Attack Graph Generation System
 
 ## Installation
@@ -67,3 +68,8 @@ When contributing code, please install the "editorconfig" plugin for your text e
 - Adds extra newline to end of file if not already there.
 - Removes whitespace at end of lines
 - Automatically sets indentation to tabs set to 4 spaces
+=======
+# ag_gen
+
+C++ Attack Graph Generation
+>>>>>>> 64be5b8cb4634d7857f4a593a3e5abf0fe968819