committing change to branch
resolved merge conflict