branch test
AND simple
& simple
Merge branch 'feature1'
add fearture1
add master
confilt fixed
add merge
merge with no-ff