updated foo.txt
added bar.txt
Merge branch 'feature-1'