corrected conflicts