Merge "Add a test for merging deleted files"