merging masters deleted files