AND simple
& simple
confilict fixed
add merge
merge with no-ff
fix bug
merged bug fix