add feature 1 txt
edit feature 1 txt
edit john txt
Merge branch 'feature1'
edit john
edit ccc