Security upgrades.
Conflict resolved.