Fix the added to both but different conflict

No match.