[arch-general] Update Conflicts