Fixed merge conflict

No match.