minor changes
resolved merge conflicts