More autoconflicting resolving.