branch test
AND simple
& simple
conflict fixed
hehe
te
add merge
merge with no-ff
delete one line
add oneline
merge dev