diff --git a/version.txt b/version.txt
index 75afa96..a664873 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1,5 @@
-A 
+<<<<<<< HEAD
+S 
+=======
+R 
+>>>>>>> branchJ-R