updated merfolk deck; new sorting order