bug fix
resolved merge conflict
edited notes