branch test
add and simple
add & simple & easy
confict fix
add a new line
merge with --no-ff
add stash line
add stash line