f1: change a.txt
f2
Merge branch 'feature2'