branch test
AND simple
& simple
conflict fixed
del \n
is feature
is master
mas&fea
ych
ych-m
Merge branch 'feature2'
add merage
merge with no-ff
2--7/8