Conflicting modification exception for 47->21 flow

No match.