Fix issue #6 - conflict screen crashing.