hehe
Simple
haha
conflict fixed
branch t
merge with no-ff