[XFS] Fix merge failure
1 file changed