diff --git a/README.txt b/README.txt
index 13f91c1..0ebf405 100644
--- a/README.txt
+++ b/README.txt
@@ -1,3 +1,7 @@
 this is a brand new file for my GIT Remote testing and learning
+<<<<<<< HEAD
+feature1
+=======
 Feature2
 Feature2 changes
+>>>>>>> feature2_additional