[XFS] Fix merge failure