understand how stage works
test delete file
delete file
branch test
and simple
& simple
conflict fixed