updated merfolk; moved some cards to FREE