This was incorrectly removed. Note that we should also take the extra meta section into account.
MB-17211 4.1.1 Minor Release
DOC-1039 Cbbackup - `conflict_resolve` no longer an extra option