corrections before xmerge