#562 Blackout Conflicts

Resolves #562, pending tests