I can't believe that the Merge Conflicts form property (or $ConflictAction = "1") hasn't been working since 6.5.1:
SPR# AMON6DZJRW - Item merging not working correctly in all situations.
And if that doesn't give you the cold shivers, its still broken in 7.0.3 and 8.0:
'Merge Replication Conflicts' does not work as expected in Notes 7.0.3 or 8.0
I have to say I'm shocked that that a key part of the Notes replication engine, something that has worked for years, doesn't work anymore. But hey, at least I can look forward to Google Gadgets in 8.5...