While OAK-1550 is about general fix for resolving same node merge conflicts. But until general issue is fixed, we should special case for hidden nodes (e.g. index sub-tree).
Discussed offline with mreutegg and chetanm about handling merge conflict for hidden nodes. Main concern to not resolve the conflict seemed to be observation (specifying/declaring what events reach which clients). For hidden nodes, observation isn't a concern. Along with that, in heavy write scenarios there are some cases (I'm aware of property index updates) which often cause conflicts – thereby wasting some time during merge attempts.