resolved merge

resolved changes