added line 1
added feature1 to foo.txt
added line 2 to feature1
added MASTER BRANCH text
added 3rd line to feature1 branch foo.txt
Merge branch 'feature1'
added feature2 text
added master text after feature2, non-conflicting
fixed?