branch test
& simple
and
&
merge
add_merge
merge with no=ff
dev2
merged dev2
dev2
confict fixed