COnflicts corrected