[arch-general] Pacman upgrade fails due to file conflits