[dune.stuff.grid.provider] resolved merge conflicts