Fix merge conflict

No match.