modified 24 reduce error 1 conflict