replenish deck
resolved conflict