Valid HTML5; text changes
Conflict resolution.