Theme integration.
Conflict resolved.