Add Conflicts to fix dead services