fix bug
resolved merge
add notes