This PR doesn't remove conflict resolution entirely - in the situation you describe, the user will still get a "Overwrite" confirmation modal when provisioning the host, and be able to confirm that he wants the record to be written.

Ultimately we can't fix the problem you describe without completely removing conflict detection - having a different hostname *is* a conflict :)