fix merge error - tweak license