add hahaha
AND simple
& simple
conflict fixed
add merge
merge no-ff
add hello.py
delete hehehe