Created attachment 97139 [details]
server item wins, URI sent back

I thought I knew what triggered the issue, but it looks like I was wrong.
Here's the log file from the local side where merging has to be done for an
update/update confict (look for "John 2 Doe") and it works correctly without
the script patch.