resolve czech conflicts
Merge pull request #8536 from adobe/randy/resolve-czech-conflicts

Resolve czech conflicts