Deleted /file2
merging: Deleted /file2