Drop manual conflict registration, it conflicts with what we intend to do.