Fix licence conflicts.