and simple
& simple
conflict fixed
add haha
merge with no-ff