made changes
Resolved merge