bug clearance
resolved merge conflict
added notes, completed