escape
don't need to mention rename explicitly?
Merge commit 'd69cf84023be0b95'