test
These are new changes
change
whoami
renamed a file
branch test
AND simple
& simple
conflict fixed
add change
merge with no-ff
add change again
deleted all