branch test
simple
%%?simple
conflict
add merge
meregewith noff
fix
merge by fix
hi
Merge branch 'dev'