change Sec.txt
change too
conflict fixed
change on the master
change on the feature2
confix
hello
Merge branch 'feature2'
change on feature3
add on feature4