Hardening tweaks
conflict resolution