removed some lines
removed text from file
mergeing commits

Merge branch 'foo'