before rebase
rename-this-file now right
Merge branch 'new'