removed double geocoding in model save
merge
fix merge conflicts