Language corrections on latest Geo doc pages (Android)
Resolve a conflict