m1
f1
master conlision
conflict fixed
firstFolder
fix issue1
merge bug fix issue1
file 1 and 2
add feature2
add feature2
add feature2