XML fixes. Merge Conflict resolution.