Corrected conflicts