add done
add merge
worked