added row for conflicts, figure out centering and shading, add table for conflicts