Correcting conflicts.