Remove conflict.
Remove conflict.

kapadia/rasterio,johanvdw/rasterio,youngpm/rasterio,perrygeo/rasterio,njwilson23/rasterio,brendan-ward/rasterio,johanvdw/rasterio,njwilson23/rasterio,brendan-ward/rasterio,youngpm/rasterio,brendan-ward/rasterio,kapadia/rasterio,kapadia/rasterio,njwilson23/rasterio,clembou/rasterio,clembou/rasterio,perrygeo/rasterio,johanvdw/rasterio,perrygeo/rasterio,clembou/rasterio,youngpm/rasterio