[arch-general] Conflict after 3 week upgrade pause