corrected conflict solving