Correcting conflicts