7fedccf
fix logic of prior Conflicts theoretically should not be required due to versioned dependeny on -headless already, but it cannot hurt either