Fix issues during merge

No match.