updating uncommited changes
resolved merge conflict