geo_merge fix column names and name column

When merging the new data to the main table, the column names are not the same unless geo.col == geo.level. This can be solved by delaying renaming of geo.col to geo.level.

Also, currently the function does not support adding names for the new geolevel, suggest adding a geo.name argument.