add optional geo field to Position model, fix geo get or create for new props
fix merge