Partial integration
Partial markup integrations.
Resolved conflicts.