resolved conflict
Added GeoServer dimension support