Merge player and dealer code