amending mergebot with new cm lic merge