Merge PlayerActionType and PlayerState