Resurrecting files lost in @#$%^&* merge