Corrected conflict