Fixed Merge Conflict

There was some conflicting code which was attempted to be fixed in the
previous commit, but for some reason did not work correctly.  I have
reinstated the code that was lost in the process.  ADDITIONALLY there is
a bug with teh fractions of disappearing cards...