Hide cards during end round
Fixed merge errors