Fix erroneous merge conflict resolve - remove duplicate licence pass