added conflict columns to issues table