Fixed Venomancer + Heroes with more than 6 base skills
Conflict fix

Conflicts:
	info.json
	scripts/npc/npc_heroes_custom.txt