diff --git a/newupstreamfile b/newupstreamfile
index 6862890..aa6d495 100644
--- a/newupstreamfile
+++ b/newupstreamfile
@@ -1,4 +1,4 @@
-line 1: new file created in upstream
+line 1: new file created in upstream # 6/18/13 4:54 jci-teska added non-conflicting text to file that is also updated by courtenayt in master
 # 6/18/13 courtenayt: added more text online directly to upstream repository via github ui
 # 6/18/13 courtenayt: added even more text online directly to upstream repository via github ui
 # 6/19/13 courtenayt: added this line to upstream repository directly
diff --git a/stagedlocal.txt b/stagedlocal.txt
index 3ce252c..ca33adf 100644
--- a/stagedlocal.txt
+++ b/stagedlocal.txt
@@ -2,4 +2,6 @@ line 1: added before stash and before pull from upstream
 line 2: added after stage & commit to local - consider this the commited local file
 
 # 6/17/13 4:09pm
-jci-teska: added this line
\ No newline at end of file
+jci-teska: added this line
+
+# 6/18/13 3:02pm jci-teska: addline and then stage file locally
\ No newline at end of file