[grid] fixes fubared conflict resolution in provider
[grid] fixes fubared conflict resolution in provider

rewritten lost code from memory in under 10 minutes, yay!

renemilk/DUNE-Stuff,renemilk/DUNE-Stuff,renemilk/DUNE-Stuff