removed new-file
removed somefile
Merge branch 'master', remote branch 'origin' into xyz