geocoding and userinput edits
conclude conflict