add some file
edit some file
rename some file into some other file
Merge branch 'some_branch'