Correctly handle merge file deletions