conflict corrected