made a change
resolved merge conflict