some comments
resolved merge conflicts
more conflicts fixed