Reducing dependency on gdal
fixed conflicts