minor updates
resolved merge conflict