[XFS] Fix merge failures