diff --git a/src/main.cpp b/src/main.cpp
index 988e108..6db08ca 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,4 +1,10 @@
+<<<<<<< HEAD
+
+//Dummy line for pull request test
+//Hello at the top
+=======
 //
+>>>>>>> upstream/master
 #include "automata.h"
 #include "pass.h"
 #include "profiler.h"