diff --git a/README.md b/README.md
index 920dc0c..37e6648 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 # tvm
-TVM (Tiny Virtual Machine) is a 16bit VM based on the LC-3 architechture
\ No newline at end of file
+TVM (Tiny Virtual Machine) is a 16bit VM based on the LC-3 architechture
+=======
+# gpvm
+ A general purpose virtual machine
+>>>>>>> 6ebe9b9bff36cedc8f3542f178e68e752e58a664