geography merge edits