Testing conflicts from attu changes