minor changes
resolved merge conflict