Ouch.
I don't think it is a feature btw but more like a bug (which you cannot switch off).

Strange you get merge conflicts on whitespace. But I see you use python so that is probably why.
You can fix the notebooks by removing the whitespace and merging, but I think it will come back.
Or adjust the notebooks based on this new whitespace?
A pain, I know.