Fixed merge error

No match.