some new file
updated somefile content
merged