Attempted to improve diagnostics when merge useded instead of mergeAll

See merge request atlas/athena!15411

Former-commit-id: df8f4c5d