Fix lic merge