Fix license conflict