Adding more changes
resolved merge conflicts