diff --git a/Notes.orig b/Notes.orig
new file mode 100644
index 0000000..f034b4d
--- /dev/null
+++ b/Notes.orig
@@ -0,0 +1,6 @@
+<<<<<<< HEAD
+test commit
+test commit 2
+=======
+test commit
+>>>>>>> aa8e536bf0c81319b1cbf92ce26cb3de3083e759