fixed some merge issues and added a case in get playable cards