(#3096) - clarify conflict resolution in docs