geodata in db
merge with master