New version creates a receipt instead of removing one.  This is much easier to check for and handles the problem of mergemaster adding a new file, etc.