[arch-general] File conflicts upgrading licenses