Fix Yi Yin being listed twice with two different ids.
Fix Cao Bao being listed twice with two different ids.