Fix NULL num_conflicts
Fix NULL num_conflicts

This only happened with NULL values anyway, but we shouldn't have
those in the num_conflicts array. Also added a status update
message to show how much work is left

bdw/GridKit,bdw/GridKit,bdw/GridKit