Merge branch 'master' of github.com:moecube/ygopro-database

locales/en-US/strings.conf

@@ -604,6 +604,7 @@
 !counter 0x4e Counter(Pendulum of Souls)
 !counter 0x104f Venemy Counter
 !counter 0x50 Counter(Performapal Turntrooper)
+!counter 0x51 Counter(Battlewasp - Nest)
 #setnames, using tab for comment
 !setname 0x1 Ally of Justice
 !setname 0x2 Genex
@@ -984,4 +985,8 @@
 !setname 0x12c Tenyi
 !setname 0x12d Simorgh
 !setname 0x12e Fortune Fairy
+<<<<<<< HEAD
 !setname 0x12f Battlewasp
+=======
+!setname 0x12f Battlewasp
+>>>>>>> 8d0779c4e1908aee77270332c849a1305a5f9637

locales/zh-CN/strings.conf

@@ -601,6 +601,7 @@
 !counter 0x4e 指示物（魂之灵摆）
 !counter 0x104f 蛊指示物
 !counter 0x50 指示物（娱乐伙伴 掉头跑骑兵）
+!counter 0x51 指示物（蜂军巢）
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス