r1794536 broke 1.9.x-strict-rep-sharing

[Stefan Fuhrmann]

Probably some subtle overlook in the conflict resolution.
Shouldn't be too hard to find & fix.

I'll do that tomorrow.

-- Stefan^2.