change with dev
branch test
fix files
fix conflict
AND simple
& simple
conflict fixed
add merge
delete add
add merge
merge with no-ff
fix bug 101
merge bug fixed 101