Add resolveTie to Pair; Refactored HighCard