license change, resolved merge conflict