cleau up code
resolve conflict and added PokerHandClassifiers as a global for linting