corrected conflict