fixed merge conflict
Added missing lic headers
Added missing lic headers