branch rest
AND simple
& simple
conflict fixes
add merge
merge with no-ff
fix bug 1010
merge bug fix 1010